diff options
| author |   Hanoh Haim <hhaim@cisco.com> | 2016-04-11 16:41:24 +0300 |
|---|---|---|
| committer | Hanoh Haim <hhaim@cisco.com> | 2016-04-11 16:41:24 +0300 |
| commit | 145a106abceaeb10f62dd40bc11010932f4b9576 (patch) | |
| tree | 98ef8b22154e9db4bb964a49fdc425e9b0c64f4d /scripts/automation/regression/stateful_tests/trex_general_test.py | |
| parent | f7d55aa327c0c6f721dee05f2f32a54d6ccf51cc (diff) | |
| parent | af49c70aaaecb897c7d3b4bddb18f504d32b0546 (diff) | |
Merge remove old code
Diffstat (limited to 'scripts/automation/regression/stateful_tests/trex_general_test.py')
| -rwxr-xr-x | scripts/automation/regression/stateful_tests/trex_general_test.py | 10 |
1 files changed, 8 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 5a13e5ff..7eae3224 100755 --- a/scripts/automation/regression/stateful_tests/trex_general_test.py +++ b/scripts/automation/regression/stateful_tests/trex_general_test.py @@ -135,10 +135,16 @@ class CTRexGeneral_Test(unittest.TestCase): if res[name] != float(val): self.fail('TRex results[%s]==%f and not as expected %f ' % (name, res[name], val)) - def check_CPU_benchmark (self, trex_res, err = 10, minimal_cpu = 30, maximal_cpu = 85): + def check_CPU_benchmark (self, trex_res, err = 10, minimal_cpu = None, maximal_cpu = 85): #cpu_util = float(trex_res.get_last_value("trex-global.data.m_cpu_util")) cpu_util = sum([float(x) for x in trex_res.get_value_list("trex-global.data.m_cpu_util")[-4:-1]]) / 3 # mean of 3 values before last - + + if minimal_cpu is None: + if '1G' in self.modes: + minimal_cpu = 1 + else: + minimal_cpu = 30 + if not self.is_virt_nics: if cpu_util > maximal_cpu: self.fail("CPU is too high (%s%%), probably queue full." % cpu_util ) |