diff options
| author |   imarom <imarom@cisco.com> | 2017-01-29 18:07:33 +0200 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2017-01-29 18:07:33 +0200 |
| commit | 519ea63d05c655a75602eb8cd77c84e6e49e827d (patch) | |
| tree | dbfb7325178a86149efce096494535b886907df7 /scripts/automation/regression/stateful_tests/trex_general_test.py | |
| parent | 42664b05103d0f4a7ed272301051d58d6e8f3737 (diff) | |
| parent | efbe56332fdf6a5c386152e4a2af3a2b56f723b5 (diff) | |
Merge branch 'master' into capture
Diffstat (limited to 'scripts/automation/regression/stateful_tests/trex_general_test.py')
| -rwxr-xr-x | scripts/automation/regression/stateful_tests/trex_general_test.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/automation/regression/stateful_tests/trex_general_test.py b/scripts/automation/regression/stateful_tests/trex_general_test.py index 4453fd94..dc3f9943 100755 --- a/scripts/automation/regression/stateful_tests/trex_general_test.py +++ b/scripts/automation/regression/stateful_tests/trex_general_test.py @@ -313,7 +313,7 @@ class CTRexGeneral_Test(unittest.TestCase): # check that max latency does not exceed 1 msec if self.configuration.trex['trex_name'] == '10.56.217.210': # temporary workaround for latency issue in kiwi02, remove it ASAP. http://trex-tgn.cisco.com/youtrack/issue/trex-194 allowed_latency = 8000 - elif self.is_VM: + elif self.is_VM or self.is_virt_nics: allowed_latency = 9999999 else: # no excuses, check 1ms allowed_latency = 1000 @@ -321,7 +321,7 @@ class CTRexGeneral_Test(unittest.TestCase): self.fail('LatencyError: Maximal latency exceeds %s (usec)' % allowed_latency) # check that avg latency does not exceed 1 msec - if self.is_VM: + if self.is_VM or self.is_virt_nics: allowed_latency = 9999999 else: # no excuses, check 1ms allowed_latency = 1000 |