Merge "Replace mock.has_calls() with assert_has_calls"

6 files changed, 11 insertions, 11 deletions

diff --git a/ironicclient/tests/unit/osc/v1/test_baremetal_chassis.py b/ironicclient/tests/unit/osc/v1/test_baremetal_chassis.py
index e067961..502f86d 100644
--- a/ironicclient/tests/unit/osc/v1/test_baremetal_chassis.py
+++ b/ironicclient/tests/unit/osc/v1/test_baremetal_chassis.py
@@ -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)
diff --git a/ironicclient/tests/unit/osc/v1/test_baremetal_node.py b/ironicclient/tests/unit/osc/v1/test_baremetal_node.py
index 0156d00..76b838c 100644
--- a/ironicclient/tests/unit/osc/v1/test_baremetal_node.py
+++ b/ironicclient/tests/unit/osc/v1/test_baremetal_node.py
@@ -510,7 +510,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)
@@ -529,7 +529,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)
diff --git a/ironicclient/tests/unit/osc/v1/test_baremetal_port.py b/ironicclient/tests/unit/osc/v1/test_baremetal_port.py
index 03cee91..3c0479c 100644
--- a/ironicclient/tests/unit/osc/v1/test_baremetal_port.py
+++ b/ironicclient/tests/unit/osc/v1/test_baremetal_port.py
@@ -626,7 +626,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)
 
@@ -641,7 +641,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)
 
diff --git a/ironicclient/tests/unit/osc/v1/test_baremetal_portgroup.py b/ironicclient/tests/unit/osc/v1/test_baremetal_portgroup.py
index 1b8dbda..2d4b67f 100644
--- a/ironicclient/tests/unit/osc/v1/test_baremetal_portgroup.py
+++ b/ironicclient/tests/unit/osc/v1/test_baremetal_portgroup.py
@@ -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)
 
diff --git a/ironicclient/tests/unit/osc/v1/test_baremetal_volume_connector.py b/ironicclient/tests/unit/osc/v1/test_baremetal_volume_connector.py
index 8c7b7b7..a39ad6f 100644
--- a/ironicclient/tests/unit/osc/v1/test_baremetal_volume_connector.py
+++ b/ironicclient/tests/unit/osc/v1/test_baremetal_volume_connector.py
@@ -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(
diff --git a/ironicclient/tests/unit/osc/v1/test_baremetal_volume_target.py b/ironicclient/tests/unit/osc/v1/test_baremetal_volume_target.py
index 3208eaf..96cbca6 100644
--- a/ironicclient/tests/unit/osc/v1/test_baremetal_volume_target.py
+++ b/ironicclient/tests/unit/osc/v1/test_baremetal_volume_target.py
@@ -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(