diff options
Diffstat (limited to 'scripts/automation')
3 files changed, 5 insertions, 4 deletions
diff --git a/scripts/automation/regression/trex_unit_test.py b/scripts/automation/regression/trex_unit_test.py index 91fab32e..6abeaab7 100755 --- a/scripts/automation/regression/trex_unit_test.py +++ b/scripts/automation/regression/trex_unit_test.py @@ -146,7 +146,6 @@ class CTRexTestConfiguringPlugin(Plugin): CTRexScenario.benchmark = self.benchmark CTRexScenario.modes = set(self.modes) CTRexScenario.server_logs = self.server_logs - CTRexScenario.scripts_path = get_trex_path() # launch TRex daemon on relevant setup if not self.local: @@ -199,8 +198,8 @@ if __name__ == "__main__": long_test = False xml_name = 'unit_test.xml' CTRexScenario.report_dir = 'reports' - CTRexScenario.scripts_dir = get_trex_path() - DAEMON_STOP_COMMAND = 'cd %s; ./trex_daemon_server stop; sleep 1; ./trex_daemon_server stop;' % CTRexScenario.scripts_dir + CTRexScenario.scripts_path = get_trex_path() + DAEMON_STOP_COMMAND = 'cd %s; ./trex_daemon_server stop; sleep 1; ./trex_daemon_server stop;' % CTRexScenario.scripts_path DAEMON_START_COMMAND = DAEMON_STOP_COMMAND + 'sleep 1; rm /var/log/trex/trex_daemon_server.log; ./trex_daemon_server start; sleep 2; ./trex_daemon_server show' setup_dir = os.getenv('SETUP_DIR', '').rstrip('/') CTRexScenario.setup_dir = check_setup_path(setup_dir) diff --git a/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py b/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py index 7856ba30..ab4a8a87 100644 --- a/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py +++ b/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py @@ -4,6 +4,7 @@ from platform_cmd_link import * import functional_general_test from nose.tools import assert_equal from nose.tools import assert_not_equal +from nose.tools import nottest from unit_tests.trex_general_test import CTRexScenario from dpkt import pcap @@ -11,6 +12,8 @@ import sys import os import subprocess +# should be set to run explicitly, not as part of all regression tests +@nottest class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test): def setUp (self): self.test_path = os.path.abspath(os.getcwd()) diff --git a/scripts/automation/regression/unit_tests/trex_general_test.py b/scripts/automation/regression/unit_tests/trex_general_test.py index 78ce3c91..af3c897d 100755 --- a/scripts/automation/regression/unit_tests/trex_general_test.py +++ b/scripts/automation/regression/unit_tests/trex_general_test.py @@ -56,7 +56,6 @@ class CTRexScenario(): scripts_path = None report_dir = 'reports' # logger = None - scripts_dir = None #scenario = CTRexScenario() |