diff options
author | 2016-03-27 15:09:30 +0300 | |
---|---|---|
committer | 2016-03-27 15:09:30 +0300 | |
commit | 3804a5dd52975a9a6fd3ff094ae16593bfeb2303 (patch) | |
tree | 87348315331081fea6e67eb3f6afe4714790705d /scripts/automation/regression | |
parent | a2fdf41ac599bdef6657642152c0acdaf488ee6c (diff) |
regression: fix failing on positive return status of server
Diffstat (limited to 'scripts/automation/regression')
-rwxr-xr-x | scripts/automation/regression/misc_methods.py | 4 | ||||
-rwxr-xr-x | scripts/automation/regression/stateful_tests/trex_imix_test.py | 24 |
2 files changed, 13 insertions, 15 deletions
diff --git a/scripts/automation/regression/misc_methods.py b/scripts/automation/regression/misc_methods.py index 97d168b0..6873622e 100755 --- a/scripts/automation/regression/misc_methods.py +++ b/scripts/automation/regression/misc_methods.py @@ -25,12 +25,12 @@ def mix_string (str): # executes given command, returns tuple (return_code, stdout, stderr) def run_command(cmd, background = False): if background: - print('Running command in background:', cmd) + print('Running command in background: %s' % cmd) with open(os.devnull, 'w') as tempf: subprocess.Popen(shlex.split(cmd), stdin=tempf, stdout=tempf, stderr=tempf) return (None,)*3 else: - print('Running command:', cmd) + print('Running command: %s' % cmd) proc = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE) (stdout, stderr) = proc.communicate() if stdout: diff --git a/scripts/automation/regression/stateful_tests/trex_imix_test.py b/scripts/automation/regression/stateful_tests/trex_imix_test.py index 43dea900..d98b6afb 100755 --- a/scripts/automation/regression/stateful_tests/trex_imix_test.py +++ b/scripts/automation/regression/stateful_tests/trex_imix_test.py @@ -50,20 +50,18 @@ class CTRexIMIX_Test(CTRexGeneral_Test): # the name intentionally not matches nose default pattern, including the test should be specified explicitly def dummy(self): - self.assertEqual(1, 2, 'boo') - self.assertEqual(2, 2, 'boo') - self.assertEqual(2, 3, 'boo') - #print '' - #print dir(self) - #print locals() - #print '' - #print_r(unittest.TestCase) - #print '' - #print_r(self) - print '' - #print unittest.TestCase.shortDescription(self) - #self.skip("I'm just a dummy test") + ret = self.trex.start_trex( + c = 1, + m = 1, + p = True, + nc = True, + d = 5, + f = 'cap2/imix_fast_1g.yaml', + l = 1000, + trex_development = True) + trex_res = self.trex.sample_to_run_finish() + print trex_res def test_routing_imix (self): # test initializtion |