openstack
/
nova
Code Issues Proposed changes

Merge "Fix invalid assert_has_calls" into stable/ussuri

This commit is contained in:
Zuul 2020-10-23 19:34:12 +00:00 committed by Gerrit Code Review
parent e676a48054 674d1cbabc
commit 29425d6fb6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9815,9 +9815,9 @@ class ComputeManagerMigrationTestCase(test.NoDBTestCase,
self.compute._remove_remote_volume_connections(self.context, 'fake',
bdms, instance)
mock_remove_vol_conn.assert_has_calls = [
mock_remove_vol_conn.assert_has_calls([
mock.call(self.context, instance, bdm.volume_id, 'fake') for
bdm in bdms]
bdm in bdms])
@mock.patch('nova.compute.rpcapi.ComputeAPI.remove_volume_connection')
def test_remove_remote_volume_connections_exc(self, mock_remove_vol_conn):
@ -9844,9 +9844,9 @@ class ComputeManagerMigrationTestCase(test.NoDBTestCase,
original_bdms, instance)
# Assert that we delete the current attachments
mock_delete_attachment.assert_has_calls = [
mock_delete_attachment.assert_has_calls([
mock.call(self.context, uuids.vol1_attach),
mock.call(self.context, uuids.vol2_attach)]
mock.call(self.context, uuids.vol2_attach)])
# Assert that we switch the attachment ids and connection_info for each
# bdm back to their original values
self.assertEqual(uuids.vol1_attach_original,