diff options
| author |   imarom <imarom@cisco.com> | 2015-12-15 11:40:35 -0500 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2015-12-15 11:40:35 -0500 |
| commit | 68bf754b96a84c8a2a32bffab30189f8c8e9ad1b (patch) | |
| tree | 03ed30251c1cc611d888bf62d5c4a8d36566dfd7 /scripts/automation/trex_control_plane/common | |
| parent | 419a25e989c47dcc5e94b9e3bc64252fb5197f10 (diff) | |
| parent | 7b1796d823b38f7c8c801e19c51a4044bc39b17c (diff) | |
Merging lastest 'master' to side branch 'vm'
Conflicts:
scripts/automation/trex_control_plane/console/trex_console.py
Diffstat (limited to 'scripts/automation/trex_control_plane/common')
| -rw-r--r-- | scripts/automation/trex_control_plane/common/trex_types.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/automation/trex_control_plane/common/trex_types.py b/scripts/automation/trex_control_plane/common/trex_types.py index 3de36e4c..7c3f04c5 100644 --- a/scripts/automation/trex_control_plane/common/trex_types.py +++ b/scripts/automation/trex_control_plane/common/trex_types.py @@ -31,10 +31,12 @@ class RC(): return not self.good() def data (self): - return [x.data if x.rc else "" for x in self.rc_list] + d = [x.data if x.rc else "" for x in self.rc_list] + return (d if len(d) > 1 else d[0]) def err (self): - return [x.data if not x.rc else "" for x in self.rc_list] + e = [x.data if not x.rc else "" for x in self.rc_list] + return (e if len(e) > 1 else e[0]) def annotate (self, desc = None, show_status = True): if desc: |