summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-10-23 19:34:12 +0000
committerGerrit Code Review <review@openstack.org>2020-10-23 19:34:12 +0000
commit29425d6fb64fa52a897c8d6c5aa8860877437d94 (patch)
tree65f5208841028afdbbb2f5143686a5b270818d9f
parente676a480544b3fa71fcaa984a658e2131b7538c5 (diff)
parent674d1cbabcf5ab2a84718cd1fc7eccaabbb59839 (diff)
downloadnova-21.1.1.tar.gz
Merge "Fix invalid assert_has_calls" into stable/ussuri21.1.1
-rw-r--r--nova/tests/unit/compute/test_compute_mgr.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/tests/unit/compute/test_compute_mgr.py b/nova/tests/unit/compute/test_compute_mgr.py
index 8c42628100..946ae4f5d8 100644
--- a/nova/tests/unit/compute/test_compute_mgr.py
+++ b/nova/tests/unit/compute/test_compute_mgr.py
@@ -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,