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/tests/unit/benchmark/scenarios/compute/test_cyclictest.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/tests/unit/benchmark/scenarios/compute/test_cyclictest.py')
| -rw-r--r-- | yardstick/tests/unit/benchmark/scenarios/compute/test_cyclictest.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/yardstick/tests/unit/benchmark/scenarios/compute/test_cyclictest.py b/yardstick/tests/unit/benchmark/scenarios/compute/test_cyclictest.py index f24ec24ec..4fadde4dc 100644 --- a/yardstick/tests/unit/benchmark/scenarios/compute/test_cyclictest.py +++ b/yardstick/tests/unit/benchmark/scenarios/compute/test_cyclictest.py @@ -17,6 +17,7 @@ import mock from oslo_serialization import jsonutils from yardstick.benchmark.scenarios.compute import cyclictest +from yardstick.common import exceptions as y_exc @mock.patch('yardstick.benchmark.scenarios.compute.cyclictest.ssh') @@ -122,7 +123,7 @@ class CyclictestTestCase(unittest.TestCase): sample_output = '{"min": 100, "avg": 500, "max": 1000}' mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '') - self.assertRaises(AssertionError, c.run, result) + self.assertRaises(y_exc.SLAValidationError, c.run, result) def test_cyclictest_unsuccessful_sla_avg_latency(self, mock_ssh): @@ -136,7 +137,7 @@ class CyclictestTestCase(unittest.TestCase): sample_output = '{"min": 100, "avg": 500, "max": 1000}' mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '') - self.assertRaises(AssertionError, c.run, result) + self.assertRaises(y_exc.SLAValidationError, c.run, result) def test_cyclictest_unsuccessful_sla_max_latency(self, mock_ssh): @@ -150,7 +151,7 @@ class CyclictestTestCase(unittest.TestCase): sample_output = '{"min": 100, "avg": 500, "max": 1000}' mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '') - self.assertRaises(AssertionError, c.run, result) + self.assertRaises(y_exc.SLAValidationError, c.run, result) def test_cyclictest_unsuccessful_script_error(self, mock_ssh): |