diff options
| author |   Emma Foley <emma.l.foley@intel.com> | 2018-06-29 08:36:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-29 08:36:04 +0000 |
| commit | 1e515b6cc3dd15c399f2663999c9734610494e5c (patch) | |
| tree | c40f1cf484ddf0d6d5bba1f749192bd594ffcda2 /yardstick/tests/unit/benchmark/scenarios/compute/test_unixbench.py | |
| parent | eb54a9e65e838e092e5acb5a8bd4119dd2e9f556 (diff) | |
| parent | eaebb40c960284d7d4ce9ad6221cba32c04a2827 (diff) | |
Merge "Convert SLA asserts to raises" into stable/fraser
Diffstat (limited to 'yardstick/tests/unit/benchmark/scenarios/compute/test_unixbench.py')
| -rw-r--r-- | yardstick/tests/unit/benchmark/scenarios/compute/test_unixbench.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/yardstick/tests/unit/benchmark/scenarios/compute/test_unixbench.py b/yardstick/tests/unit/benchmark/scenarios/compute/test_unixbench.py index 6339a2dcd..e4a8d6e26 100644 --- a/yardstick/tests/unit/benchmark/scenarios/compute/test_unixbench.py +++ b/yardstick/tests/unit/benchmark/scenarios/compute/test_unixbench.py @@ -17,6 +17,7 @@ import mock from oslo_serialization import jsonutils from yardstick.benchmark.scenarios.compute import unixbench +from yardstick.common import exceptions as y_exc @mock.patch('yardstick.benchmark.scenarios.compute.unixbench.ssh') @@ -122,7 +123,7 @@ class UnixbenchTestCase(unittest.TestCase): sample_output = '{"single_score":"200.7","parallel_score":"4395.9"}' mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '') - self.assertRaises(AssertionError, u.run, result) + self.assertRaises(y_exc.SLAValidationError, u.run, result) def test_unixbench_unsuccessful_sla_parallel_score(self, mock_ssh): @@ -137,7 +138,7 @@ class UnixbenchTestCase(unittest.TestCase): sample_output = '{"signle_score":"2251.7","parallel_score":"3395.9"}' mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '') - self.assertRaises(AssertionError, u.run, result) + self.assertRaises(y_exc.SLAValidationError, u.run, result) def test_unixbench_unsuccessful_script_error(self, mock_ssh): |