openstack
/
nova
Code Issues Proposed changes

Merge "Simplify uses of assert_has_calls"

This commit is contained in:
Jenkins 2017-02-09 13:24:12 +00:00 committed by Gerrit Code Review
parent 9e555dc5c1 5c37c43a97
commit 70038388fb
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

@ -12031,7 +12031,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()
@ -12054,7 +12054,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()
@ -12080,7 +12080,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()
@ -12104,10 +12104,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()