Skip to content

Commit cf7d28e

Browse files
Fix non-existent method of Mock
There is no method called_once_with() in Mock object. Use assert_called_once_with() or assert_has_calls() instead. Change-Id: I9f73fcbe7c3dfd64e75ac8224c13934b03443cd5 Closes-Bug: #1544522
1 parent 872a823 commit cf7d28e

File tree

6 files changed

+24
-20
lines changed

6 files changed

+24
-20
lines changed

nova/tests/unit/compute/test_compute_api.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5130,7 +5130,8 @@ def test_live_migrate_abort_succeeded(self,
51305130
mock_rec_action.assert_called_once_with(self.context,
51315131
instance,
51325132
instance_actions.LIVE_MIGRATION_CANCEL)
5133-
mock_lm_abort.called_once_with(self.context, instance, migration.id)
5133+
mock_lm_abort.assert_called_once_with(self.context, instance,
5134+
migration.id)
51345135

51355136
@mock.patch('nova.compute.api.API._record_action_start')
51365137
@mock.patch.object(compute_rpcapi.ComputeAPI, 'live_migration_abort')
@@ -5157,7 +5158,8 @@ def test_live_migrate_abort_in_queue_succeeded(self,
51575158
support_abort_in_queue=True)
51585159
mock_rec_action.assert_called_once_with(
51595160
self.context, instance, instance_actions.LIVE_MIGRATION_CANCEL)
5160-
mock_lm_abort.called_once_with(self.context, instance, migration)
5161+
mock_lm_abort.assert_called_once_with(self.context, instance,
5162+
migration.id)
51615163
mock_get_migration.reset_mock()
51625164
mock_rec_action.reset_mock()
51635165
mock_lm_abort.reset_mock()

nova/tests/unit/compute/test_compute_mgr.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8633,8 +8633,8 @@ def _test(mock_get_bdms, mock_net_api, mock_remove_conn, mock_usage,
86338633

86348634
mock_remove_conn.assert_called_once_with(self.context, instance,
86358635
bdm.volume_id, None)
8636-
mock_attach_delete.called_once_with(self.context,
8637-
new_attachment_id)
8636+
mock_attach_delete.assert_called_once_with(self.context,
8637+
new_attachment_id)
86388638
self.assertEqual(bdm.attachment_id, orig_attachment_id)
86398639
self.assertEqual(orig_attachment_id, bdm.connection_info)
86408640
bdm.save.assert_called_once_with()

nova/tests/unit/conductor/tasks/test_live_migrate.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,8 +678,9 @@ def _test(instance_pci_reqs,
678678
self.task.instance.pci_requests = instance_pci_reqs
679679
self.task._check_can_migrate_pci("Src", "Dst")
680680
# in case we managed to get away without rasing, check mocks
681-
mock_supp_port_binding_ext.called_once_with(self.context)
682681
if instance_pci_reqs:
682+
mock_supp_port_binding_ext.assert_called_once_with(
683+
self.context)
683684
self.assertTrue(mock_supp_vif_related_pci_alloc.called)
684685

685686
# instance has no PCI requests

nova/tests/unit/console/test_websocketproxy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def test_new_websocket_client_db(
108108
return_value=ctxt):
109109
self.wh.new_websocket_client()
110110

111-
mock_validate.called_once_with(ctxt, '123-456-789')
111+
mock_validate.assert_called_once_with(ctxt, '123-456-789')
112112
mock_validate_port.assert_called_once_with(
113113
ctxt, mock_inst_get.return_value, str(db_obj['port']),
114114
db_obj['console_type'])

nova/tests/unit/pci/test_utils.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -290,15 +290,15 @@ def test_correct_behaviour(self):
290290
self.mock_get_ifname.return_value = self.if_name
291291
net_name = utils.get_net_name_by_vf_pci_address(self.pci_address)
292292
self.assertEqual(ref_net_name, net_name)
293-
self.mock_get_mac.called_once_with(self.pci_address)
294-
self.mock_get_ifname.called_once_with(self.pci_address)
293+
self.mock_get_mac.assert_called_once_with(self.pci_address)
294+
self.mock_get_ifname.assert_called_once_with(self.pci_address)
295295

296296
def test_wrong_mac(self):
297297
self.mock_get_mac.side_effect = (
298298
exception.PciDeviceNotFoundById(self.pci_address))
299299
net_name = utils.get_net_name_by_vf_pci_address(self.pci_address)
300300
self.assertIsNone(net_name)
301-
self.mock_get_mac.called_once_with(self.pci_address)
301+
self.mock_get_mac.assert_called_once_with(self.pci_address)
302302
self.mock_get_ifname.assert_not_called()
303303

304304
def test_wrong_ifname(self):
@@ -307,5 +307,5 @@ def test_wrong_ifname(self):
307307
exception.PciDeviceNotFoundById(self.pci_address))
308308
net_name = utils.get_net_name_by_vf_pci_address(self.pci_address)
309309
self.assertIsNone(net_name)
310-
self.mock_get_mac.called_once_with(self.pci_address)
311-
self.mock_get_ifname.called_once_with(self.pci_address)
310+
self.mock_get_mac.assert_called_once_with(self.pci_address)
311+
self.mock_get_ifname.assert_called_once_with(self.pci_address)

nova/tests/unit/virt/libvirt/test_driver.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7682,8 +7682,7 @@ def test_disconnect_volume_native_luks(self, mock_get_volume_encryptor):
76827682
drvr._disconnect_volume(self.context, connection_info, instance,
76837683
encryption=encryption)
76847684
drvr._host.delete_secret.assert_not_called()
7685-
mock_encryptor.detach_volume.called_once_with(self.context,
7686-
**encryption)
7685+
mock_encryptor.detach_volume.assert_called_once_with(**encryption)
76877686

76887687
@mock.patch.object(libvirt_driver.LibvirtDriver, '_detach_encryptor')
76897688
@mock.patch('nova.objects.InstanceList.get_uuids_by_host')
@@ -12631,9 +12630,9 @@ def fake_lookup(_uuid):
1263112630
self.assertEqual(info[1]['over_committed_disk_size'], 18146236825)
1263212631

1263312632
vdmock.XMLDesc.assert_called_once_with(0)
12634-
mock_qemu_img_info.called_once_with('/test/disk.local')
12635-
mock_stat.called_once_with('/test/disk')
12636-
mock_get_size.called_once_with('/test/disk')
12633+
mock_qemu_img_info.assert_called_once_with('/test/disk.local')
12634+
mock_stat.assert_called_once_with('/test/disk')
12635+
mock_get_size.assert_called_once_with('/test/disk')
1263712636
mock_get_disk_backing_file.assert_called()
1263812637

1263912638
def test_post_live_migration(self):
@@ -15389,8 +15388,8 @@ def test_get_pcinet_info(self):
1538915388
"rxvlan", "txvlan"]
1539015389
}
1539115390
self.assertEqual(expect_vf, actualvf)
15392-
mock_get_net_name.called_once_with(parent_address)
15393-
mock_dev_lookup.called_once_with(dev_name)
15391+
mock_get_net_name.assert_called_once_with(parent_address)
15392+
mock_dev_lookup.assert_called_once_with(dev_name)
1539415393

1539515394
@mock.patch.object(pci_utils, 'get_ifname_by_pci_address')
1539615395
def test_get_pcidev_info_non_nic(self, mock_get_ifname):
@@ -17356,7 +17355,7 @@ def test_cleanup_failed_start_failed_poweroff_destroy_disks(self):
1735617355
self.assertRaises(test.TestingException,
1735717356
drvr._cleanup_failed_start,
1735817357
None, None, None, None, guest, True)
17359-
mock_cleanup.called_once_with(None, None, network_info=None,
17358+
mock_cleanup.assert_called_once_with(None, None, network_info=None,
1736017359
block_device_info=None, destroy_disks=True)
1736117360
self.assertTrue(guest.poweroff.called)
1736217361

@@ -19916,7 +19915,9 @@ def test_cleanup_resize_snap_backend_image_does_not_exist(self):
1991619915
self.context, ins_ref, _fake_network_info(self, 1))
1991719916
mock_get_path.assert_called_once_with(ins_ref)
1991819917
self.assertFalse(mock_remove.called)
19919-
mock_rmtree.called_once_with('/fake/inst')
19918+
self.assertEqual(5, mock_rmtree.call_count)
19919+
mock_rmtree.assert_has_calls([mock.call('/fake/inst_resize',
19920+
ignore_errors=True)] * 5)
1992019921

1992119922
def test_get_instance_disk_info_exception(self):
1992219923
instance = self._create_instance()

0 commit comments

Comments
 (0)