From 82d38c0ecd915bd7c4f5d4790253e6cc18858753 Mon Sep 17 00:00:00 2001 From: Mark McClain Date: Fri, 7 Sep 2012 14:52:12 -0400 Subject: [PATCH] remove incorrect mock assert_called in unit tests fixes bug 1047569 The unit tests were calling a nonexistent assert_called() on the mocks. This patch fixes the problem by using the correct assert for checking that the mocked method was invoked. Note: This patch does not fix the error in test_call_driver() because a separate bug fix revises the test. Change-Id: Ie62e2e64f314f9ba34761e63cd5d0d6e44c5d094 --- quantum/tests/unit/test_dhcp_agent.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/quantum/tests/unit/test_dhcp_agent.py b/quantum/tests/unit/test_dhcp_agent.py index fe71ec518..2ab84f498 100644 --- a/quantum/tests/unit/test_dhcp_agent.py +++ b/quantum/tests/unit/test_dhcp_agent.py @@ -338,7 +338,7 @@ class TestDhcpPluginApiProxy(unittest.TestCase): def test_get_active_networks(self): self.proxy.get_active_networks() - self.call.assert_called() + self.assertTrue(self.call.called) self.make_msg.assert_called_once_with('get_active_networks', host='foo') @@ -346,7 +346,7 @@ class TestDhcpPluginApiProxy(unittest.TestCase): self.call.return_value = dict(a=1) retval = self.proxy.get_network_info('netid') self.assertEqual(retval.a, 1) - self.call.assert_called() + self.assertTrue(self.call.called) self.make_msg.assert_called_once_with('get_network_info', network_id='netid', host='foo') @@ -355,7 +355,7 @@ class TestDhcpPluginApiProxy(unittest.TestCase): self.call.return_value = dict(a=1) retval = self.proxy.get_dhcp_port('netid', 'devid') self.assertEqual(retval.a, 1) - self.call.assert_called() + self.assertTrue(self.call.called) self.make_msg.assert_called_once_with('get_dhcp_port', network_id='netid', device_id='devid', @@ -363,7 +363,7 @@ class TestDhcpPluginApiProxy(unittest.TestCase): def test_release_dhcp_port(self): self.proxy.release_dhcp_port('netid', 'devid') - self.call.assert_called() + self.assertTrue(self.call.called) self.make_msg.assert_called_once_with('release_dhcp_port', network_id='netid', device_id='devid', @@ -371,7 +371,7 @@ class TestDhcpPluginApiProxy(unittest.TestCase): def test_release_port_fixed_ip(self): self.proxy.release_port_fixed_ip('netid', 'devid', 'subid') - self.call.assert_called() + self.assertTrue(self.call.called) self.make_msg.assert_called_once_with('release_port_fixed_ip', network_id='netid', subnet_id='subid', @@ -381,7 +381,7 @@ class TestDhcpPluginApiProxy(unittest.TestCase): def test_update_lease_expiration(self): with mock.patch.object(self.proxy, 'cast') as mock_cast: self.proxy.update_lease_expiration('netid', 'ipaddr', 1) - mock_cast.assert_called() + self.assertTrue(mock_cast.called) self.make_msg.assert_called_once_with('update_lease_expiration', network_id='netid', ip_address='ipaddr', -- 2.45.2