Remove faulty .assert_has_calls([])

Some UT use <mock>.assert_has_calls([]) as a way to check if mock
wasn't called - this doesn't work because assert_has_calls only checks
if passed calls are present in mock_calls and hence it is always true
regardless of whether mock was called or not. This can lead to falsely
passed tests.

Change-Id: I1be5327854cc3dc2f5b3733f2bad78200cfbbfd2
Closes-Bug: #1368234

diff --git a/neutron/tests/unit/services/loadbalancer/drivers/radware/test_plugin_driver.py b/neutron/tests/unit/services/loadbalancer/drivers/radware/test_plugin_driver.py
index ae59764d631cecc1e55461ba77a4d8a4123446aa..048ddde3b36d2379bc89d215b00149681560d5f5 100644 (file)
--- a/neutron/tests/unit/services/loadbalancer/drivers/radware/test_plugin_driver.py
+++ b/neutron/tests/unit/services/loadbalancer/drivers/radware/test_plugin_driver.py
@@ -174,7 +174,7 @@ class TestLoadBalancerPlugin(TestLoadBalancerPluginBase):
                                 'tenant_id', 'port_name',
                                 'network_id', '10.10.10.10')
         self.plugin_instance._core_plugin.get_ports.assert_called_once()
-        self.plugin_instance._core_plugin.create_port.assert_has_calls([])
+        self.assertFalse(self.plugin_instance._core_plugin.create_port.called)
 
     def test_rest_client_recover_was_called(self):
         """Call the real REST client and verify _recover is called."""

diff --git a/neutron/tests/unit/test_iptables_firewall.py b/neutron/tests/unit/test_iptables_firewall.py
index d1da6b2752ec51c75ad99b2b751ceef8b7d22c17..57b7cd6f5151ca416dd7a8fcaf1169d1aab04593 100644 (file)
--- a/neutron/tests/unit/test_iptables_firewall.py
+++ b/neutron/tests/unit/test_iptables_firewall.py
@@ -1019,7 +1019,7 @@ class IptablesFirewallTestCase(base.BaseTestCase):
         port = self._fake_port()
         self.firewall.remove_port_filter(port)
         # checking no exception occures
-        self.v4filter_inst.assert_has_calls([])
+        self.assertFalse(self.v4filter_inst.called)
 
     def test_defer_apply(self):
         with self.firewall.defer_apply():

diff --git a/neutron/tests/unit/test_linux_interface.py b/neutron/tests/unit/test_linux_interface.py
index 809216e6a5380a6cc9930246c3aa8b0b7c6fecea..a236dd899573173341254290568a344229908338 100644 (file)
--- a/neutron/tests/unit/test_linux_interface.py
+++ b/neutron/tests/unit/test_linux_interface.py
@@ -394,7 +394,7 @@ class TestBridgeInterfaceDriver(TestBase):
                     'port-1234',
                     'tap0',
                     'aa:bb:cc:dd:ee:ff')
-            self.ip_dev.assert_has_calls([])
+            self.assertFalse(self.ip_dev.called)
             self.assertEqual(log.call_count, 1)
 
     def test_plug_mtu(self):

diff --git a/neutron/tests/unit/test_security_groups_rpc.py b/neutron/tests/unit/test_security_groups_rpc.py
index d26c904be33fd76234bfbc264098fc75ceb68693..524932c9f6a483d40846fd0fab551255e0047182 100644 (file)
--- a/neutron/tests/unit/test_security_groups_rpc.py
+++ b/neutron/tests/unit/test_security_groups_rpc.py
@@ -1000,7 +1000,7 @@ class SecurityGroupAgentRpcTestCase(BaseSecurityGroupAgentRpcTestCase):
         self.agent.refresh_firewall = mock.Mock()
         self.agent.prepare_devices_filter(['fake_port_id'])
         self.agent.security_groups_rule_updated(['fake_sgid3', 'fake_sgid4'])
-        self.agent.refresh_firewall.assert_has_calls([])
+        self.assertFalse(self.agent.refresh_firewall.called)
 
     def test_security_groups_member_updated(self):
         self.agent.refresh_firewall = mock.Mock()
@@ -1013,7 +1013,7 @@ class SecurityGroupAgentRpcTestCase(BaseSecurityGroupAgentRpcTestCase):
         self.agent.refresh_firewall = mock.Mock()
         self.agent.prepare_devices_filter(['fake_port_id'])
         self.agent.security_groups_member_updated(['fake_sgid3', 'fake_sgid4'])
-        self.agent.refresh_firewall.assert_has_calls([])
+        self.assertFalse(self.agent.refresh_firewall.called)
 
     def test_security_groups_provider_updated(self):
         self.agent.refresh_firewall = mock.Mock()
@@ -1041,7 +1041,7 @@ class SecurityGroupAgentRpcTestCase(BaseSecurityGroupAgentRpcTestCase):
 
     def test_refresh_firewall_none(self):
         self.agent.refresh_firewall([])
-        self.firewall.assert_has_calls([])
+        self.assertFalse(self.firewall.called)
 
 
 class SecurityGroupAgentEnhancedRpcTestCase(
@@ -1157,7 +1157,7 @@ class SecurityGroupAgentEnhancedRpcTestCase(
 
     def test_refresh_firewall_none_enhanced_rpc(self):
         self.agent.refresh_firewall([])
-        self.firewall.assert_has_calls([])
+        self.assertFalse(self.firewall.called)
 
 
 class SecurityGroupAgentRpcWithDeferredRefreshTestCase(