diff --git a/tests/unit/benchmark/scenarios/mistral/test_utils.py b/tests/unit/benchmark/scenarios/mistral/test_utils.py index ac15c9cd02..4b217022a6 100644 --- a/tests/unit/benchmark/scenarios/mistral/test_utils.py +++ b/tests/unit/benchmark/scenarios/mistral/test_utils.py @@ -18,15 +18,11 @@ import mock from rally.benchmark.scenarios.mistral import utils from tests.unit import test -BM_UTILS = "rally.benchmark.utils" MISTRAL_UTILS = "rally.benchmark.scenarios.mistral.utils" class MistralScenarioTestCase(test.TestCase): - def setUp(self): - super(MistralScenarioTestCase, self).setUp() - def _test_atomic_action_timer(self, atomic_actions, name): action_duration = atomic_actions.get(name) self.assertIsNotNone(action_duration) diff --git a/tests/unit/benchmark/test_types.py b/tests/unit/benchmark/test_types.py index 1f0bfb5e32..a71f0e8bb9 100644 --- a/tests/unit/benchmark/test_types.py +++ b/tests/unit/benchmark/test_types.py @@ -255,22 +255,21 @@ class PreprocessTestCase(test.TestCase): class FileTypeTestCase(test.TestCase): - def setUp(self): - super(FileTypeTestCase, self).setUp() - self.clients = fakes.FakeClients() - @mock.patch("rally.benchmark.types.open", side_effect=mock.mock_open(read_data="file_context"), create=True) def test_transform_by_path(self, mock_open): resource_config = "file.yaml" file_context = types.FileType.transform( - clients=self.clients, + clients=None, resource_config=resource_config) self.assertEqual(file_context, "file_context") - def test_transform_by_path_no_match(self): + @mock.patch("rally.benchmark.types.open", + side_effect=IOError, create=True) + def test_transform_by_path_no_match(self, mock_open): resource_config = "nonexistant.yaml" self.assertRaises(IOError, types.FileType.transform, - self.clients, resource_config) + clients=None, + resource_config=resource_config)