openstack/nova
Code Issues Proposed changes

Merge "Fix Mock assert_called_once_with() usage"

Browse Source
This commit is contained in:
Jenkins
2016-01-19 11:01:09 +00:00
committed by Gerrit Code Review
parent 3900adee73 6f95a34c80
commit ed257473e3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/unit/virt/vmwareapi/test_vmops.py
View File

@@ -527,7 +527,7 @@ class VMwareVMOpsTestCase(test.NoDBTestCase):
resize_instance=resize_instance, resize_instance=resize_instance,
image_meta=None, image_meta=None,
power_on=power_on) 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) 'fake-ref', self._instance, None)
if power_on: if power_on:
fake_power_on.assert_called_once_with(self._session, fake_power_on.assert_called_once_with(self._session,
@@ -656,8 +656,8 @@ class VMwareVMOpsTestCase(test.NoDBTestCase):
mock_attach_disk.assert_called_once_with( mock_attach_disk.assert_called_once_with(
'fake-ref', self._instance, 'fake-adapter', 'fake-disk', 'fake-ref', self._instance, 'fake-adapter', 'fake-disk',
'[fake] uuid/root.vmdk') '[fake] uuid/root.vmdk')
fake_remove_ephemerals_and_swap.called_once_with('fake-ref') fake_remove_ephemerals_and_swap.assert_called_once_with('fake-ref')
fake_resize_create_ephemerals_and_swap.called_once_with( fake_resize_create_ephemerals_and_swap.assert_called_once_with(
'fake-ref', self._instance, None) 'fake-ref', self._instance, None)
if power_on: if power_on:
fake_power_on.assert_called_once_with(self._session, fake_power_on.assert_called_once_with(self._session,

2
nova/tests/unit/virt/xenapi/test_agent.py
View File

@@ -230,7 +230,7 @@ class RebootRetryTestCase(AgentTestCaseBase):
self.assertEqual("done", result) self.assertEqual("done", result)
self.assertTrue(mock_session.VM.get_domid.called) self.assertTrue(mock_session.VM.get_domid.called)
self.assertEqual(2, mock_session.call_plugin.call_count) 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") "fake_dom_id", "asdf")
@mock.patch.object(time, 'sleep') @mock.patch.object(time, 'sleep')