summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2016-03-13 10:57:28 +0200
committerYaroslav Brustinov <ybrustin@cisco.com>2016-03-13 10:57:28 +0200
commitaa4706e1e3af49eef118416560d29fad4f0f0e42 (patch)
treec4849c48124d48c25426b3438ddbcbda9eb273f7 /scripts
parent4c7026517965700242fe4aebf47f099a6ffd7842 (diff)
regression: fix - error in some type of tests leads to ignoring other types of tests.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/automation/regression/trex_unit_test.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/automation/regression/trex_unit_test.py b/scripts/automation/regression/trex_unit_test.py
index 67b74fea..c8565c19 100755
--- a/scripts/automation/regression/trex_unit_test.py
+++ b/scripts/automation/regression/trex_unit_test.py
@@ -326,13 +326,14 @@ if __name__ == "__main__":
additional_args = ['--stf'] + CTRexScenario.test_types['stateful_tests']
if xml_arg:
additional_args += ['--with-xunit', xml_arg.replace('.xml', '_stateful.xml')]
- result = result and nose.run(argv = nose_argv + additional_args, addplugins = [red_nose, config_plugin])
+ result = nose.run(argv = nose_argv + additional_args, addplugins = [red_nose, config_plugin]) and result
if len(CTRexScenario.test_types['stateless_tests']):
additional_args = ['--stl', 'stateless_tests/stl_general_test.py:STLBasic_Test.test_connectivity'] + CTRexScenario.test_types['stateless_tests']
if xml_arg:
additional_args += ['--with-xunit', xml_arg.replace('.xml', '_stateless.xml')]
- result = result and nose.run(argv = nose_argv + additional_args, addplugins = [red_nose, config_plugin])
+ result = nose.run(argv = nose_argv + additional_args, addplugins = [red_nose, config_plugin]) and result
except Exception as e:
+ result = False
print e
finally:
save_setup_info()