openstack/neutron
Code Issues Proposed changes

Merge "Stop using non-existent method of Mock"

Browse Source
This commit is contained in:
Jenkins 2016-02-19 11:07:14 +00:00 committed by Gerrit Code Review
commit 155ae9d7d2
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/hacking/checks.py
View File

@ -115,12 +115,14 @@ def check_assert_called_once_with(logical_line, filename):
# assert_called_once
# assertCalledOnceWith
# assert_has_called
# called_once_with
if 'neutron/tests/' in filename:
if '.assert_called_once_with(' in logical_line:
return
uncased_line = logical_line.lower().replace('_', '')
if '.assertcalledonce' in uncased_line:
check_calls = ['.assertcalledonce', '.calledoncewith']
if any(x for x in check_calls if x in uncased_line):
msg = ("N322: Possible use of no-op mock method. "
"please use assert_called_once_with.")
yield (0, msg)

2
neutron/tests/unit/agent/dhcp/test_agent.py
View File

@ -1505,8 +1505,8 @@ class TestDeviceManager(base.BaseTestCase):
uuid5.return_value = '1ae5f96c-c527-5079-82ea-371a01645457'
dh = dhcp.DeviceManager(cfg.CONF, None)
uuid5.called_once_with(uuid.NAMESPACE_DNS, cfg.CONF.host)
self.assertEqual(dh.get_device_id(fake_net), expected)
uuid5.assert_called_once_with(uuid.NAMESPACE_DNS, cfg.CONF.host)
def test_update(self):
# Try with namespaces and no metadata network

6
neutron/tests/unit/agent/metadata/test_agent.py
View File

@ -205,9 +205,9 @@ class TestMetadataProxyHandlerCache(TestMetadataProxyHandlerBase):
) as mock_get_router_networks:
ports = self.handler._get_ports(remote_address,
router_id=router_id)
mock_get_router_networks.called_once_with(router_id)
mock_get_ip_addr.assert_called_once_with(remote_address, networks)
self.assertEqual(expected, ports)
mock_get_router_networks.assert_called_once_with(router_id)
mock_get_ip_addr.assert_called_once_with(remote_address, networks)
self.assertEqual(expected, ports)
def test_get_ports_no_id(self):
self.assertRaises(TypeError, self.handler._get_ports, 'remote_address')

10
neutron/tests/unit/hacking/test_checks.py
View File

@ -103,6 +103,11 @@ class HackingTestCase(base.BaseTestCase):
mock.method.assertCalledOnceWith()
"""
fail_code3 = """
mock = Mock()
mock.method(1, 2, 3, test='wow')
mock.method.called_once_with()
"""
fail_code4 = """
mock = Mock()
mock.method(1, 2, 3, test='wow')
mock.method.assert_has_called()
@ -123,11 +128,14 @@ class HackingTestCase(base.BaseTestCase):
self.assertEqual(
1, len(list(checks.check_assert_called_once_with(fail_code2,
"neutron/tests/test_assert.py"))))
self.assertEqual(
1, len(list(checks.check_assert_called_once_with(fail_code3,
"neutron/tests/test_assert.py"))))
self.assertEqual(
0, len(list(checks.check_assert_called_once_with(pass_code,
"neutron/tests/test_assert.py"))))
self.assertEqual(
1, len(list(checks.check_assert_called_once_with(fail_code3,
1, len(list(checks.check_assert_called_once_with(fail_code4,
"neutron/tests/test_assert.py"))))
self.assertEqual(
0, len(list(checks.check_assert_called_once_with(pass_code2,