From 6f95a34c80cad7527436c0c41cbf66ec3cecbede Mon Sep 17 00:00:00 2001 From: Ghanshyam Date: Fri, 15 Jan 2016 10:43:49 +0900 Subject: [PATCH] Fix Mock assert_called_once_with() usage Mock object has assert_called_once_with() but not called_once_with(). But in some unit tests later one is used which tests nothing. This commit use assert_called_once_with instead of called_once_with. Change-Id: I481b7d326fd119826782965f2cd5ace154651c81 --- nova/tests/unit/virt/vmwareapi/test_vmops.py | 6 +++--- nova/tests/unit/virt/xenapi/test_agent.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nova/tests/unit/virt/vmwareapi/test_vmops.py b/nova/tests/unit/virt/vmwareapi/test_vmops.py index 5f476101f84c..13d549617cd4 100644 --- a/nova/tests/unit/virt/vmwareapi/test_vmops.py +++ b/nova/tests/unit/virt/vmwareapi/test_vmops.py @@ -527,7 +527,7 @@ class VMwareVMOpsTestCase(test.NoDBTestCase): resize_instance=resize_instance, image_meta=None, power_on=power_on) - fake_resize_create_ephemerals_and_swap.called_once_with( + fake_resize_create_ephemerals_and_swap.assert_called_once_with( 'fake-ref', self._instance, None) if power_on: fake_power_on.assert_called_once_with(self._session, @@ -656,8 +656,8 @@ class VMwareVMOpsTestCase(test.NoDBTestCase): mock_attach_disk.assert_called_once_with( 'fake-ref', self._instance, 'fake-adapter', 'fake-disk', '[fake] uuid/root.vmdk') - fake_remove_ephemerals_and_swap.called_once_with('fake-ref') - fake_resize_create_ephemerals_and_swap.called_once_with( + fake_remove_ephemerals_and_swap.assert_called_once_with('fake-ref') + fake_resize_create_ephemerals_and_swap.assert_called_once_with( 'fake-ref', self._instance, None) if power_on: fake_power_on.assert_called_once_with(self._session, diff --git a/nova/tests/unit/virt/xenapi/test_agent.py b/nova/tests/unit/virt/xenapi/test_agent.py index fedbcd05997b..5fe07b569b83 100644 --- a/nova/tests/unit/virt/xenapi/test_agent.py +++ b/nova/tests/unit/virt/xenapi/test_agent.py @@ -230,7 +230,7 @@ class RebootRetryTestCase(AgentTestCaseBase): self.assertEqual("done", result) self.assertTrue(mock_session.VM.get_domid.called) self.assertEqual(2, mock_session.call_plugin.call_count) - mock_wait.called_once_with(mock_session, self.vm_ref, + mock_wait.assert_called_once_with(mock_session, self.vm_ref, "fake_dom_id", "asdf") @mock.patch.object(time, 'sleep')