diff options
| author |   Miikka Koistinen <miikka.koistinen@nokia.com> | 2018-06-08 13:54:48 +0300 |
|---|---|---|
| committer |   Emma Foley <emma.l.foley@intel.com> | 2018-06-28 11:26:39 +0100 |
| commit | eaebb40c960284d7d4ce9ad6221cba32c04a2827 (patch) | |
| tree | 083aef2a3eaa90981665a0947255dd3e20fdb1b6 /yardstick/benchmark/scenarios/compute/perf.py | |
| parent | 441d5f55a6e2e155d01d4b396678d0d09bfb8413 (diff) | |
Convert SLA asserts to raises
This commit converts Python assertions to a custom exception in all
places where SLA validation is checked with an assertion.
This commit also fixes all emerged pylint errors.
JIRA: YARDSTICK-966
Change-Id: If771ed03b2cbc0a43a57fcfb9293f18740b3ff80
Signed-off-by: Miikka Koistinen <miikka.koistinen@nokia.com>
(cherry picked from 39f80e9b06395ae1515cfcf08508504ad4dd978a)
Diffstat (limited to 'yardstick/benchmark/scenarios/compute/perf.py')
| -rw-r--r-- | yardstick/benchmark/scenarios/compute/perf.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/yardstick/benchmark/scenarios/compute/perf.py b/yardstick/benchmark/scenarios/compute/perf.py index 0b8ed9b28..b973211f1 100644 --- a/yardstick/benchmark/scenarios/compute/perf.py +++ b/yardstick/benchmark/scenarios/compute/perf.py @@ -93,7 +93,7 @@ class Perf(base.Scenario): % (load, duration, events_string) LOG.debug("Executing command: %s", cmd) - status, stdout, stderr = self.client.execute(cmd) + status, stdout, _ = self.client.execute(cmd) if status: raise RuntimeError(stdout) @@ -105,16 +105,14 @@ class Perf(base.Scenario): exp_val = self.scenario_cfg['sla']['expected_value'] smaller_than_exp = 'smaller_than_expected' \ in self.scenario_cfg['sla'] - - if metric not in result: - assert False, "Metric (%s) not found." % metric - else: - if smaller_than_exp: - assert result[metric] < exp_val, "%s %d >= %d (sla); " \ - % (metric, result[metric], exp_val) - else: - assert result[metric] >= exp_val, "%s %d < %d (sla); " \ - % (metric, result[metric], exp_val) + self.verify_SLA(metric in result, + "Metric (%s) not found." % metric) + self.verify_SLA( + not smaller_than_exp, + "%s %d >= %d (sla); " % (metric, result[metric], exp_val)) + self.verify_SLA( + result[metric] >= exp_val, + "%s %d < %d (sla); " % (metric, result[metric], exp_val)) def _test(): |