openstack
/
nova
Code Issues Proposed changes

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.

Conflicts:
    nova/tests/unit/conductor/tasks/test_live_migrate.py
    nova/tests/unit/virt/libvirt/test_driver.py

NOTE(takashin): The conflict is due to not having the following changes
in stable/stein.

    I734cc01dce13f9e75a16639faf890ddb1661b7eb
    Ief2c959d7c339e11b19e521de6e7d1be2f8722f8

The changes for ComputeAPIAPICellUnitTestCase (Cells v1 test cases) was
added in nova/tests/unit/compute/test_compute_api.py
because the following change has not been applied in stable/stein.

    Ib0e0b708c46e4330e51f8f8fdfbb02d45aaf0f44

Change-Id: I9f73fcbe7c3dfd64e75ac8224c13934b03443cd5
Closes-Bug: #1544522
(cherry picked from commit cf7d28eb6e)
This commit is contained in:
Takashi NATSUME 2019-08-07 14:38:45 +09:00
parent a8e19afb3d
commit d90186068b
5 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nova/tests/unit/compute/test_compute_api.py
View File

@ -5568,33 +5568,32 @@ class _ComputeAPIUnitTestMixIn(object):
return migration
@mock.patch('nova.compute.api.API._record_action_start')
@mock.patch.object(compute_rpcapi.ComputeAPI, 'live_migration_abort')
@mock.patch.object(objects.Migration, 'get_by_id_and_instance')
def test_live_migrate_abort_succeeded(self,
mock_get_migration,
mock_lm_abort,
mock_rec_action):
instance = self._create_instance_obj()
instance.task_state = task_states.MIGRATING
migration = self._get_migration(21, 'running', 'live-migration')
mock_get_migration.return_value = migration
self.compute_api.live_migrate_abort(self.context,
instance,
migration.id)
with mock.patch.object(self.compute_api.compute_rpcapi,
'live_migration_abort') as mock_lm_abort:
self.compute_api.live_migrate_abort(self.context,
instance,
migration.id)
mock_lm_abort.assert_called_once_with(self.context, instance,
migration.id)
mock_rec_action.assert_called_once_with(self.context,
instance,
instance_actions.LIVE_MIGRATION_CANCEL)
mock_lm_abort.called_once_with(self.context, instance, migration.id)
@mock.patch('nova.compute.api.API._record_action_start')
@mock.patch.object(compute_rpcapi.ComputeAPI, 'live_migration_abort')
@mock.patch.object(objects.Migration, 'get_by_id_and_instance')
@mock.patch.object(objects.Service, 'get_by_compute_host')
def test_live_migrate_abort_in_queue_succeeded(self,
mock_get_service,
mock_get_migration,
mock_lm_abort,
mock_rec_action):
service_obj = objects.Service()
service_obj.version = (
@ -5606,16 +5605,18 @@ class _ComputeAPIUnitTestMixIn(object):
migration = self._get_migration(
21, migration_status, 'live-migration')
mock_get_migration.return_value = migration
self.compute_api.live_migrate_abort(self.context,
instance,
migration.id,
support_abort_in_queue=True)
with mock.patch.object(self.compute_api.compute_rpcapi,
'live_migration_abort') as mock_lm_abort:
self.compute_api.live_migrate_abort(
self.context, instance, migration.id,
support_abort_in_queue=True)
mock_lm_abort.assert_called_once_with(self.context, instance,
migration.id)
mock_rec_action.assert_called_once_with(
self.context, instance, instance_actions.LIVE_MIGRATION_CANCEL)
mock_lm_abort.called_once_with(self.context, instance, migration)
mock_get_migration.reset_mock()
mock_rec_action.reset_mock()
mock_lm_abort.reset_mock()
@mock.patch.object(objects.Migration, 'get_by_id_and_instance')
def test_live_migration_abort_in_queue_old_microversion_fails(

4
nova/tests/unit/compute/test_compute_mgr.py
View File

@ -8651,8 +8651,8 @@ class ComputeManagerMigrationTestCase(test.NoDBTestCase,
mock_remove_conn.assert_called_once_with(self.context, instance,
bdm.volume_id, None)
mock_attach_delete.called_once_with(self.context,
new_attachment_id)
mock_attach_delete.assert_called_once_with(self.context,
new_attachment_id)
self.assertEqual(bdm.attachment_id, orig_attachment_id)
self.assertEqual(orig_attachment_id, bdm.connection_info)
bdm.save.assert_called_once_with()

2
nova/tests/unit/console/test_websocketproxy.py
View File

@ -109,7 +109,7 @@ class NovaProxyRequestHandlerDBTestCase(test.TestCase):
return_value=ctxt):
self.wh.new_websocket_client()
mock_validate.called_once_with(ctxt, '123-456-789')
mock_validate.assert_called_once_with(ctxt, '123-456-789')
mock_validate_port.assert_called_once_with(
ctxt, mock_inst_get.return_value, str(db_obj['port']),
db_obj['console_type'])

10
nova/tests/unit/pci/test_utils.py
View File

@ -291,15 +291,15 @@ class GetNetNameByVfPciAddressTestCase(test.NoDBTestCase):
self.mock_get_ifname.return_value = self.if_name
net_name = utils.get_net_name_by_vf_pci_address(self.pci_address)
self.assertEqual(ref_net_name, net_name)
self.mock_get_mac.called_once_with(self.pci_address)
self.mock_get_ifname.called_once_with(self.pci_address)
self.mock_get_mac.assert_called_once_with(self.pci_address)
self.mock_get_ifname.assert_called_once_with(self.pci_address)
def test_wrong_mac(self):
self.mock_get_mac.side_effect = (
exception.PciDeviceNotFoundById(self.pci_address))
net_name = utils.get_net_name_by_vf_pci_address(self.pci_address)
self.assertIsNone(net_name)
self.mock_get_mac.called_once_with(self.pci_address)
self.mock_get_mac.assert_called_once_with(self.pci_address)
self.mock_get_ifname.assert_not_called()
def test_wrong_ifname(self):
@ -308,5 +308,5 @@ class GetNetNameByVfPciAddressTestCase(test.NoDBTestCase):
exception.PciDeviceNotFoundById(self.pci_address))
net_name = utils.get_net_name_by_vf_pci_address(self.pci_address)
self.assertIsNone(net_name)
self.mock_get_mac.called_once_with(self.pci_address)
self.mock_get_ifname.called_once_with(self.pci_address)
self.mock_get_mac.assert_called_once_with(self.pci_address)
self.mock_get_ifname.assert_called_once_with(self.pci_address)

19
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -7621,8 +7621,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
drvr._disconnect_volume(self.context, connection_info, instance,
encryption=encryption)
drvr._host.delete_secret.assert_not_called()
mock_encryptor.detach_volume.called_once_with(self.context,
**encryption)
mock_encryptor.detach_volume.assert_called_once_with(**encryption)
@mock.patch.object(libvirt_driver.LibvirtDriver, '_detach_encryptor')
@mock.patch('nova.objects.InstanceList.get_uuids_by_host')
@ -12569,9 +12568,9 @@ class LibvirtConnTestCase(test.NoDBTestCase,
self.assertEqual(info[1]['over_committed_disk_size'], 18146236825)
vdmock.XMLDesc.assert_called_once_with(0)
mock_qemu_img_info.called_once_with('/test/disk.local')
mock_stat.called_once_with('/test/disk')
mock_get_size.called_once_with('/test/disk')
mock_qemu_img_info.assert_called_once_with('/test/disk.local')
mock_stat.assert_called_once_with('/test/disk')
mock_get_size.assert_called_once_with('/test/disk')
def test_post_live_migration(self):
vol1_conn_info = {'data': {'test_data': mock.sentinel.vol1},
@ -15317,8 +15316,8 @@ class LibvirtConnTestCase(test.NoDBTestCase,
"rxvlan", "txvlan"]
}
self.assertEqual(expect_vf, actualvf)
mock_get_net_name.called_once_with(parent_address)
mock_dev_lookup.called_once_with(dev_name)
mock_get_net_name.assert_called_once_with(parent_address)
mock_dev_lookup.assert_called_once_with(dev_name)
@mock.patch.object(pci_utils, 'get_ifname_by_pci_address')
def test_get_pcidev_info_non_nic(self, mock_get_ifname):
@ -17265,7 +17264,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
self.assertRaises(test.TestingException,
drvr._cleanup_failed_start,
None, None, None, None, guest, True)
mock_cleanup.called_once_with(None, None, network_info=None,
mock_cleanup.assert_called_once_with(None, None, network_info=None,
block_device_info=None, destroy_disks=True)
self.assertTrue(guest.poweroff.called)
@ -19887,7 +19886,9 @@ class LibvirtDriverTestCase(test.NoDBTestCase, TraitsComparisonMixin):
self.context, ins_ref, _fake_network_info(self, 1))
mock_get_path.assert_called_once_with(ins_ref)
self.assertFalse(mock_remove.called)
mock_rmtree.called_once_with('/fake/inst')
self.assertEqual(5, mock_rmtree.call_count)
mock_rmtree.assert_has_calls([mock.call('/fake/inst_resize',
ignore_errors=True)] * 5)
def test_get_instance_disk_info_exception(self):
instance = self._create_instance()