From 7ca1b61cbe391093b1ffe1825d79b3e49fe9b989 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Sun, 25 Dec 2016 16:29:24 +0200 Subject: Regression: handle exceptions during mapping to skip other tests Change-Id: Icbb0a2469be5c90248b80eb46c1c80355b48acb1 Signed-off-by: Yaroslav Brustinov --- .../regression/stateless_tests/stl_general_test.py | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'scripts/automation/regression/stateless_tests') diff --git a/scripts/automation/regression/stateless_tests/stl_general_test.py b/scripts/automation/regression/stateless_tests/stl_general_test.py index 590733ba..2a6b72fd 100644 --- a/scripts/automation/regression/stateless_tests/stl_general_test.py +++ b/scripts/automation/regression/stateless_tests/stl_general_test.py @@ -16,10 +16,10 @@ class CStlGeneral_Test(CTRexGeneral_Test): if CTRexScenario.stl_init_error: self.skip(CTRexScenario.stl_init_error) - def connect(self, timeout = 100): + def connect(self, tries = 10): # need delay and check only because TRex process might be still starting sys.stdout.write('Connecting') - for i in range(timeout): + for i in range(tries): try: sys.stdout.write('.') sys.stdout.flush() @@ -27,20 +27,24 @@ class CStlGeneral_Test(CTRexGeneral_Test): print('') return True except: - time.sleep(0.1) + time.sleep(0.5) print('') return False - def map_ports(self, timeout = 100): + def map_ports(self, tries = 10): sys.stdout.write('Mapping ports') - for i in range(timeout): + for i in range(tries): sys.stdout.write('.') sys.stdout.flush() - CTRexScenario.stl_ports_map = stl_map_ports(self.stl_trex) - if self.verify_bidirectional(CTRexScenario.stl_ports_map): - print('') - return True - time.sleep(0.1) + try: + CTRexScenario.stl_ports_map = stl_map_ports(self.stl_trex) + if self.verify_bidirectional(CTRexScenario.stl_ports_map): + print('') + return True + except Exception as e: + print('\nException during mapping: %s' % e) + return False + time.sleep(0.5) print('') return False -- cgit