diff options
| author | Zuul <zuul@review.opendev.org> | 2021-03-07 10:32:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-03-07 10:32:12 +0000 |
| commit | ec9afd69b63c1f8e2ab1795a0d93ffc1e0b24d49 (patch) | |
| tree | c3a1adbbf37eb0201a9885bb2fe6b30ea14832a3 | |
| parent | fc0ee38b8b1fa6def273b32c4cda3e37a898b86e (diff) | |
| parent | b1e757884aa1a10c939337ba83caf9bf8d615305 (diff) | |
| download | glance-ec9afd69b63c1f8e2ab1795a0d93ffc1e0b24d49.tar.gz | |
Merge "Fix nonsensical test mocks and assertions"
| -rw-r--r-- | glance/tests/unit/async_/flows/plugins/test_inject_image_metadata.py | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/glance/tests/unit/async_/flows/plugins/test_inject_image_metadata.py b/glance/tests/unit/async_/flows/plugins/test_inject_image_metadata.py index 076e81571..4c37a7272 100644 --- a/glance/tests/unit/async_/flows/plugins/test_inject_image_metadata.py +++ b/glance/tests/unit/async_/flows/plugins/test_inject_image_metadata.py @@ -52,14 +52,16 @@ class TestInjectImageMetadataTask(test_utils.BaseTestCase): self.context = mock.MagicMock() self.img_repo = mock.MagicMock() self.task_repo = mock.MagicMock() - self.image_id = mock.MagicMock() + self.image_id = UUID1 self.gateway = gateway.Gateway() self.task_factory = domain.TaskFactory() self.img_factory = self.gateway.get_image_factory(self.context) self.image = self.img_factory.new_image(image_id=UUID1, disk_format='qcow2', - container_format='bare') + container_format='bare', + extra_properties={}) + self.img_repo.get.return_value = self.image task_input = { "import_from": "http://cloud.foo/image.qcow2", @@ -86,16 +88,10 @@ class TestInjectImageMetadataTask(test_utils.BaseTestCase): self.config(inject={"test": "abc"}, group='inject_metadata_properties') - with mock.patch.object(self.img_repo, 'get') as get_mock: - image = mock.MagicMock(image_id=self.image_id, - extra_properties={"test": "abc"}) - get_mock.return_value = image - - with mock.patch.object(self.img_repo, 'save') as save_mock: - inject_image_metadata.execute() - get_mock.assert_called_once_with(self.image_id) - save_mock.assert_called_once_with(image) - self.assertEqual({"test": "abc"}, image.extra_properties) + inject_image_metadata.execute() + self.img_repo.get.assert_called_once_with(self.image_id) + self.img_repo.save.assert_called_once_with(self.image) + self.assertEqual({"test": "abc"}, self.image.extra_properties) def test_inject_image_metadata_using_admin_user(self): context = test_unit_utils.get_fake_context(roles='admin') @@ -107,12 +103,8 @@ class TestInjectImageMetadataTask(test_utils.BaseTestCase): group='inject_metadata_properties') inject_image_metadata.execute() - - with mock.patch.object(self.img_repo, 'get') as get_mock: - get_mock.assert_not_called() - - with mock.patch.object(self.img_repo, 'save') as save_mock: - save_mock.assert_not_called() + self.img_repo.get.assert_called_once_with(UUID1) + self.img_repo.save.assert_called_once_with(self.image) def test_inject_image_metadata_empty(self): context = test_unit_utils.get_fake_context(roles='member') @@ -123,9 +115,5 @@ class TestInjectImageMetadataTask(test_utils.BaseTestCase): self.config(inject={}, group='inject_metadata_properties') inject_image_metadata.execute() - - with mock.patch.object(self.img_repo, 'get') as get_mock: - get_mock.assert_not_called() - - with mock.patch.object(self.img_repo, 'save') as save_mock: - save_mock.assert_not_called() + self.img_repo.get.assert_not_called() + self.img_repo.save.assert_not_called() |