openstack
/
nova
Code Issues Proposed changes

Simplify uses of assert_has_calls 

Change I40d2800ea9dacd65cfa54d61c49746f7abbd1a5b introduced some calls
too assert_has_calls, instead use assert_called_once_with as its simpler
in cases where a method has only been called once.

Change-Id: I3c3f8d65d04beaec6698ea64790a0b73fec4c1b2
This commit is contained in:
Derek Higgins 2017-02-01 11:44:35 +00:00
parent f40467b0eb
commit 5c37c43a97
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12021,7 +12021,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
self.assertEqual(2, mock_domain.ID.call_count)
mock_domain.destroy.assert_called_once_with()
mock_domain.undefineFlags.assert_has_calls([mock.call(1)])
mock_domain.undefineFlags.assert_called_once_with(1)
mock_domain.undefine.assert_called_once_with()
mock_save.assert_called_once_with()
@ -12044,7 +12044,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
self.assertEqual(1, mock_domain.ID.call_count)
mock_domain.destroy.assert_called_once_with()
mock_domain.undefineFlags.assert_has_calls([mock.call(1)])
mock_domain.undefineFlags.assert_called_once_with(1)
mock_domain.hasManagedSaveImage.assert_has_calls([mock.call(0)])
mock_domain.managedSaveRemove.assert_called_once_with(0)
mock_domain.undefine.assert_called_once_with()
@ -12070,7 +12070,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
self.assertEqual(1, mock_domain.ID.call_count)
mock_domain.destroy.assert_called_once_with()
mock_domain.undefineFlags.assert_has_calls([mock.call(1)])
mock_domain.undefineFlags.assert_called_once_with(1)
mock_domain.hasManagedSaveImage.assert_has_calls([mock.call(0)])
mock_domain.undefine.assert_called_once_with()
mock_save.assert_called_once_with()
@ -12094,10 +12094,10 @@ class LibvirtConnTestCase(test.NoDBTestCase):
self.assertEqual(1, mock_domain.ID.call_count)
mock_domain.destroy.assert_called_once_with()
# undefineFlags should now be called with 5 as uefi us supported
mock_domain.undefineFlags.assert_has_calls([mock.call(
mock_domain.undefineFlags.assert_called_once_with(
fakelibvirt.VIR_DOMAIN_UNDEFINE_MANAGED_SAVE |
fakelibvirt.VIR_DOMAIN_UNDEFINE_NVRAM
)])
)
mock_domain.undefine.assert_not_called()
mock_save.assert_called_once_with()