Replace mock.has_calls() with assert_has_calls
mock object has no has_calls() method, but assert_has_calls(). This patch fixes some misuses of this method. Change-Id: If2795ebe8d4893d9f99e5e82732757d08cc27237
This commit is contained in:
parent
5dad0a6d4d
commit
a0eb965a47
|
@ -145,7 +145,7 @@ class TestChassisDelete(TestChassis):
|
|||
|
||||
# Set expected values
|
||||
args = [uuid1, uuid2]
|
||||
self.baremetal_mock.chassis.delete.has_calls(
|
||||
self.baremetal_mock.chassis.delete.assert_has_calls(
|
||||
[mock.call(x) for x in args]
|
||||
)
|
||||
self.assertEqual(2, self.baremetal_mock.chassis.delete.call_count)
|
||||
|
@ -167,7 +167,7 @@ class TestChassisDelete(TestChassis):
|
|||
|
||||
# Set expected values
|
||||
args = [uuid1, uuid2]
|
||||
self.baremetal_mock.chassis.delete.has_calls(
|
||||
self.baremetal_mock.chassis.delete.assert_has_calls(
|
||||
[mock.call(x) for x in args]
|
||||
)
|
||||
self.assertEqual(2, self.baremetal_mock.chassis.delete.call_count)
|
||||
|
|
|
@ -505,7 +505,7 @@ class TestBaremetalDelete(TestBaremetal):
|
|||
|
||||
# Set expected values
|
||||
args = ['xxx-xxxxxx-xxxx', 'fakename']
|
||||
self.baremetal_mock.node.delete.has_calls(
|
||||
self.baremetal_mock.node.delete.assert_has_calls(
|
||||
[mock.call(x) for x in args]
|
||||
)
|
||||
self.assertEqual(2, self.baremetal_mock.node.delete.call_count)
|
||||
|
@ -524,7 +524,7 @@ class TestBaremetalDelete(TestBaremetal):
|
|||
|
||||
# Set expected values
|
||||
args = ['xxx-xxxxxx-xxxx', 'badname']
|
||||
self.baremetal_mock.node.delete.has_calls(
|
||||
self.baremetal_mock.node.delete.assert_has_calls(
|
||||
[mock.call(x) for x in args]
|
||||
)
|
||||
self.assertEqual(2, self.baremetal_mock.node.delete.call_count)
|
||||
|
|
|
@ -580,7 +580,7 @@ class TestBaremetalPortDelete(TestBaremetalPort):
|
|||
self.cmd.take_action(parsed_args)
|
||||
|
||||
args = ['zzz-zzzzzz-zzzz', 'fakename']
|
||||
self.baremetal_mock.port.delete.has_calls(
|
||||
self.baremetal_mock.port.delete.assert_has_calls(
|
||||
[mock.call(x) for x in args])
|
||||
self.assertEqual(2, self.baremetal_mock.port.delete.call_count)
|
||||
|
||||
|
@ -595,7 +595,7 @@ class TestBaremetalPortDelete(TestBaremetalPort):
|
|||
parsed_args)
|
||||
|
||||
args = ['zzz-zzzzzz-zzzz', 'badname']
|
||||
self.baremetal_mock.port.delete.has_calls(
|
||||
self.baremetal_mock.port.delete.assert_has_calls(
|
||||
[mock.call(x) for x in args])
|
||||
self.assertEqual(2, self.baremetal_mock.port.delete.call_count)
|
||||
|
||||
|
|
|
@ -472,7 +472,7 @@ class TestBaremetalPortGroupDelete(TestBaremetalPortGroup):
|
|||
|
||||
args = [baremetal_fakes.baremetal_portgroup_uuid,
|
||||
baremetal_fakes.baremetal_portgroup_name]
|
||||
self.baremetal_mock.portgroup.delete.has_calls(
|
||||
self.baremetal_mock.portgroup.delete.assert_has_calls(
|
||||
[mock.call(x) for x in args])
|
||||
self.assertEqual(2, self.baremetal_mock.portgroup.delete.call_count)
|
||||
|
||||
|
|
|
@ -569,7 +569,7 @@ class TestDeleteBaremetalVolumeConnector(TestBaremetalVolumeConnector):
|
|||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
self.baremetal_mock.volume_connector.delete.has_calls(
|
||||
self.baremetal_mock.volume_connector.delete.assert_has_calls(
|
||||
[mock.call(baremetal_fakes.baremetal_volume_connector_uuid),
|
||||
mock.call(fake_volume_connector_uuid2)])
|
||||
self.assertEqual(
|
||||
|
@ -613,7 +613,7 @@ class TestDeleteBaremetalVolumeConnector(TestBaremetalVolumeConnector):
|
|||
self.cmd.take_action,
|
||||
parsed_args)
|
||||
|
||||
self.baremetal_mock.volume_connector.delete.has_calls(
|
||||
self.baremetal_mock.volume_connector.delete.assert_has_calls(
|
||||
[mock.call(baremetal_fakes.baremetal_volume_connector_uuid),
|
||||
mock.call(fake_volume_connector_uuid2)])
|
||||
self.assertEqual(
|
||||
|
|
|
@ -641,7 +641,7 @@ class TestDeleteBaremetalVolumeTarget(TestBaremetalVolumeTarget):
|
|||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
self.baremetal_mock.volume_target.delete.has_calls(
|
||||
self.baremetal_mock.volume_target.delete.assert_has_calls(
|
||||
[mock.call(baremetal_fakes.baremetal_volume_target_uuid),
|
||||
mock.call(fake_volume_target_uuid2)])
|
||||
self.assertEqual(
|
||||
|
@ -685,7 +685,7 @@ class TestDeleteBaremetalVolumeTarget(TestBaremetalVolumeTarget):
|
|||
self.cmd.take_action,
|
||||
parsed_args)
|
||||
|
||||
self.baremetal_mock.volume_target.delete.has_calls(
|
||||
self.baremetal_mock.volume_target.delete.assert_has_calls(
|
||||
[mock.call(baremetal_fakes.baremetal_volume_target_uuid),
|
||||
mock.call(fake_volume_target_uuid2)])
|
||||
self.assertEqual(
|
||||
|
|
Loading…
Reference in New Issue