summaryrefslogtreecommitdiffstats
path: root/scripts/automation/regression
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2016-01-31 16:07:53 +0200
committerYaroslav Brustinov <ybrustin@cisco.com>2016-01-31 16:07:53 +0200
commit1a935f2987f2885fc8af29ed866ec0b2125ee85c (patch)
tree1650ca92e0d1d23ff7b976650e25aa95135154ff /scripts/automation/regression
parentd4b2ae7ddbaae8660ddaff710bf4a5459ff0657f (diff)
add driver for Ubuntu 14.04.3, remove seconds from regression start time at HTML report, HLTAPI improvements
Diffstat (limited to 'scripts/automation/regression')
-rwxr-xr-xscripts/automation/regression/CPlatform.py10
-rwxr-xr-xscripts/automation/regression/aggregate_results.py4
2 files changed, 7 insertions, 7 deletions
diff --git a/scripts/automation/regression/CPlatform.py b/scripts/automation/regression/CPlatform.py
index 09c99566..6741d5c1 100755
--- a/scripts/automation/regression/CPlatform.py
+++ b/scripts/automation/regression/CPlatform.py
@@ -651,7 +651,7 @@ class CPlatform(object):
response = self.cmd_link.run_single_command(command, timeout = 10)
if CShowParser.parse_image_existence(response, img_name):
self.needed_image_path = '%s:%s' % (search_drive, img_name)
- print 'Found image in platform:', self.needed_image_path
+ print('Found image in platform:', self.needed_image_path)
return True
return False
@@ -707,8 +707,8 @@ class CPlatform(object):
progress_thread.start()
response = self.cmd_link.run_single_command(cache, timeout = 900, read_until = ['\?', '\#'])
- print "RESPONSE:"
- print response
+ print("RESPONSE:")
+ print(response)
progress_thread.join()
copy_ok = CShowParser.parse_file_copy(response)
@@ -865,7 +865,7 @@ class CStaticRouteConfig(object):
def dump_config (self):
import yaml
- print yaml.dump( self.static_route_dict , default_flow_style=False)
+ print(yaml.dump( self.static_route_dict , default_flow_style=False))
class CNatConfig(object):
@@ -901,7 +901,7 @@ class CNatConfig(object):
def dump_config (self):
import yaml
- print yaml.dump( self.nat_dict , default_flow_style=False)
+ print(yaml.dump( self.nat_dict , default_flow_style=False))
if __name__ == "__main__":
diff --git a/scripts/automation/regression/aggregate_results.py b/scripts/automation/regression/aggregate_results.py
index 5e0fadb3..2a21b4be 100755
--- a/scripts/automation/regression/aggregate_results.py
+++ b/scripts/automation/regression/aggregate_results.py
@@ -389,7 +389,7 @@ if __name__ == '__main__':
with open(start_time_file) as f:
start_time = int(f.read())
total_time = int(time.time()) - start_time
- html_output += add_th_td('Regression start:', datetime.datetime.fromtimestamp(start_time).strftime('%d/%m/%Y %H:%M:%S'))
+ html_output += add_th_td('Regression start:', datetime.datetime.fromtimestamp(start_time).strftime('%d/%m/%Y %H:%M'))
html_output += add_th_td('Regression duration:', datetime.timedelta(seconds = total_time))
html_output += add_th_td('Tests count:', tests_count_string)
for key in trex_info_dict:
@@ -507,7 +507,7 @@ if __name__ == '__main__':
with open(start_time_file) as f:
start_time = int(f.read())
total_time = int(time.time()) - start_time
- mail_output += add_th_td('Regression start:', datetime.datetime.fromtimestamp(start_time).strftime('%d/%m/%Y %H:%M:%S'))
+ mail_output += add_th_td('Regression start:', datetime.datetime.fromtimestamp(start_time).strftime('%d/%m/%Y %H:%M'))
mail_output += add_th_td('Regression duration:', datetime.timedelta(seconds = total_time))
mail_output += add_th_td('Tests count:', tests_count_string)
for key in trex_info_dict: