From d7270bba3a4f8b89314abf82e21346fc81d6a6df Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Mon, 11 Jan 2016 15:35:51 +0200 Subject: regression: don't run CStlBasic_Test as part of regression with all tests, will be used at building stage. remove duplication of scripts_path with scripts_dir --- .../regression/unit_tests/functional_tests/stl_basic_tests.py | 3 +++ scripts/automation/regression/unit_tests/trex_general_test.py | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts/automation/regression/unit_tests') 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() -- cgit 1.2.3-korg