From 3e1cfcefc2cef3e3418b4310e6c4c49d43c1d80b Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 15 Dec 2022 11:07:35 +0000 Subject: [PATCH] Remove unused mocks Change I764b0086d0bf39d4ca8cb308696169282b12b42b removed the final use of 'get_by_instance_uuid'. These mocks have been unused since. Change-Id: I179720d6ed6dd2d1aca682cd1213c4d6c77ebcfe Signed-off-by: Stephen Finucane --- nova/tests/unit/virt/ironic/test_driver.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/nova/tests/unit/virt/ironic/test_driver.py b/nova/tests/unit/virt/ironic/test_driver.py index 52aa37ac13..04f1967f25 100644 --- a/nova/tests/unit/virt/ironic/test_driver.py +++ b/nova/tests/unit/virt/ironic/test_driver.py @@ -1172,8 +1172,7 @@ class IronicDriverTestCase(test.NoDBTestCase): @mock.patch.object(ironic_driver.IronicDriver, '_get_node_list') @mock.patch.object(objects.InstanceList, 'get_uuids_by_host') @mock.patch.object(objects.ServiceList, 'get_all_computes_by_hv_type') - @mock.patch.object(FAKE_CLIENT.node, 'get_by_instance_uuid') - def test_get_info_cached(self, mock_gbiu, mock_svc_by_hv, + def test_get_info_cached(self, mock_svc_by_hv, mock_uuids_by_host, mock_get_node_list): properties = {'memory_mb': 512, 'cpus': 2} power_state = ironic_states.POWER_ON @@ -1181,7 +1180,6 @@ class IronicDriverTestCase(test.NoDBTestCase): instance_uuid=self.instance_uuid, properties=properties, power_state=power_state) - mock_gbiu.return_value = node mock_svc_by_hv.return_value = [] mock_get_node_list.return_value = [node] @@ -1193,7 +1191,6 @@ class IronicDriverTestCase(test.NoDBTestCase): result = self.driver.get_info(instance) self.assertEqual(hardware.InstanceInfo(state=nova_states.RUNNING), result) - mock_gbiu.assert_not_called() @mock.patch.object(ironic_driver.IronicDriver, '_get_node_list') @mock.patch.object(objects.InstanceList, 'get_uuids_by_host') @@ -1288,7 +1285,6 @@ class IronicDriverTestCase(test.NoDBTestCase): self.mock_conn.get_node.return_value = node mock_node.validate.return_value = ironic_utils.get_test_validation() - mock_node.get_by_instance_uuid.return_value = node mock_node.set_provision_state.return_value = mock.MagicMock() fake_looping_call = FakeLoopingCall() @@ -1356,7 +1352,6 @@ class IronicDriverTestCase(test.NoDBTestCase): mock_node.get.return_value = node mock_node.validate.return_value = ironic_utils.get_test_validation() - mock_node.get_by_instance_uuid.return_value = node mock_node.set_provision_state.return_value = mock.MagicMock() fake_looping_call = FakeLoopingCall() @@ -1719,11 +1714,9 @@ class IronicDriverTestCase(test.NoDBTestCase): mock_required_by): mock_required_by.return_value = False node_uuid = 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee' - node = _get_cached_node(driver='fake', uuid=node_uuid) flavor = ironic_utils.get_test_flavor(ephemeral_gb=1) instance = fake_instance.fake_instance_obj(self.ctx, node=node_uuid) instance.flavor = flavor - mock_node.get_by_instance_uuid.return_value = node mock_node.set_provision_state.return_value = mock.MagicMock() image_meta = ironic_utils.get_test_image_meta()