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/storage/test_fio.py | |
| parent | eb54a9e65e838e092e5acb5a8bd4119dd2e9f556 (diff) | |
| parent | eaebb40c960284d7d4ce9ad6221cba32c04a2827 (diff) | |
Merge "Convert SLA asserts to raises" into stable/fraser
Diffstat (limited to 'yardstick/tests/unit/benchmark/scenarios/storage/test_fio.py')
| -rw-r--r-- | yardstick/tests/unit/benchmark/scenarios/storage/test_fio.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/yardstick/tests/unit/benchmark/scenarios/storage/test_fio.py b/yardstick/tests/unit/benchmark/scenarios/storage/test_fio.py index f149cee69..6e69ddc6d 100644 --- a/yardstick/tests/unit/benchmark/scenarios/storage/test_fio.py +++ b/yardstick/tests/unit/benchmark/scenarios/storage/test_fio.py @@ -18,6 +18,7 @@ import mock from oslo_serialization import jsonutils from yardstick.benchmark.scenarios.storage import fio +from yardstick.common import exceptions as y_exc @mock.patch('yardstick.benchmark.scenarios.storage.fio.ssh') @@ -203,7 +204,7 @@ class FioTestCase(unittest.TestCase): sample_output = self._read_sample_output(self.sample_output['rw']) mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '') - self.assertRaises(AssertionError, p.run, result) + self.assertRaises(y_exc.SLAValidationError, p.run, result) def test_fio_successful_bw_iops_sla(self, mock_ssh): @@ -252,7 +253,7 @@ class FioTestCase(unittest.TestCase): sample_output = self._read_sample_output(self.sample_output['rw']) mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '') - self.assertRaises(AssertionError, p.run, result) + self.assertRaises(y_exc.SLAValidationError, p.run, result) def test_fio_unsuccessful_script_error(self, mock_ssh): |