diff options
| author |   Yaroslav Brustinov <ybrustin@cisco.com> | 2016-06-08 11:23:07 +0300 |
|---|---|---|
| committer | Yaroslav Brustinov <ybrustin@cisco.com> | 2016-06-08 11:23:07 +0300 |
| commit | cacad4a8dbafca95b875f1eb619c229d4a7d604d (patch) | |
| tree | fcfb14f6f4e886b496c4e9e7d8deae8df74a7364 /scripts/automation/regression/stateless_tests | |
| parent | ca8b613f14121579d99ce8b7c994e5b87984d410 (diff) | |
regression: speedup stateless with --skip-clean flag
Diffstat (limited to 'scripts/automation/regression/stateless_tests')
3 files changed, 6 insertions, 1 deletions
diff --git a/scripts/automation/regression/stateless_tests/stl_client_test.py b/scripts/automation/regression/stateless_tests/stl_client_test.py index c5e0c3c6..ed125cde 100644 --- a/scripts/automation/regression/stateless_tests/stl_client_test.py +++ b/scripts/automation/regression/stateless_tests/stl_client_test.py @@ -46,6 +46,8 @@ class STLClient_Test(CStlGeneral_Test): @classmethod def tearDownClass(cls): + if CTRexScenario.stl_init_error: + return # connect back at end of tests if not cls.is_connected(): CTRexScenario.stl_trex.connect() diff --git a/scripts/automation/regression/stateless_tests/stl_general_test.py b/scripts/automation/regression/stateless_tests/stl_general_test.py index 4ff1eec9..82738f96 100644 --- a/scripts/automation/regression/stateless_tests/stl_general_test.py +++ b/scripts/automation/regression/stateless_tests/stl_general_test.py @@ -85,7 +85,8 @@ class STLBasic_Test(CStlGeneral_Test): @nottest def test_connectivity(self): if not self.is_loopback: - CTRexScenario.router.load_clean_config() + if CTRexScenario.router_cfg['forceImageReload']: + CTRexScenario.router.load_clean_config() CTRexScenario.router.configure_basic_interfaces() CTRexScenario.router.config_pbr(mode = "config") diff --git a/scripts/automation/regression/stateless_tests/stl_rx_test.py b/scripts/automation/regression/stateless_tests/stl_rx_test.py index 9725e821..80e6bee6 100644 --- a/scripts/automation/regression/stateless_tests/stl_rx_test.py +++ b/scripts/automation/regression/stateless_tests/stl_rx_test.py @@ -41,6 +41,8 @@ class STLRX_Test(CStlGeneral_Test): @classmethod def tearDownClass(cls): + if CTRexScenario.stl_init_error: + return # connect back at end of tests if not cls.is_connected(): CTRexScenario.stl_trex.connect() |