openstack
/
neutron
Code Issues Proposed changes

Merge "Fix check_asserttruefalse syntax validator"

This commit is contained in:
Jenkins 2016-08-15 18:04:40 +00:00 committed by Gerrit Code Review
parent 730da40778 7eff6aff42
commit feb13c5791
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/hacking/checks.py
View File

@ -196,19 +196,19 @@ def check_python3_no_iteritems(logical_line):
def check_asserttruefalse(logical_line, filename):
"""N328 - Don't use assertEqual(True/False, observed)."""
if 'neutron/tests/' in filename:
if re.search(r"assertEqual\(\s*True,[^,]*(,[^,]*)?\)", logical_line):
if re.search(r"assertEqual\(\s*True,[^,]*(,[^,]*)?", logical_line):
msg = ("N328: Use assertTrue(observed) instead of "
"assertEqual(True, observed)")
yield (0, msg)
if re.search(r"assertEqual\([^,]*,\s*True(,[^,]*)?\)", logical_line):
if re.search(r"assertEqual\([^,]*,\s*True(,[^,]*)?", logical_line):
msg = ("N328: Use assertTrue(observed) instead of "
"assertEqual(True, observed)")
yield (0, msg)
if re.search(r"assertEqual\(\s*False,[^,]*(,[^,]*)?\)", logical_line):
if re.search(r"assertEqual\(\s*False,[^,]*(,[^,]*)?", logical_line):
msg = ("N328: Use assertFalse(observed) instead of "
"assertEqual(False, observed)")
yield (0, msg)
if re.search(r"assertEqual\([^,]*,\s*False(,[^,]*)?\)", logical_line):
if re.search(r"assertEqual\([^,]*,\s*False(,[^,]*)?", logical_line):
msg = ("N328: Use assertFalse(observed) instead of "
"assertEqual(False, observed)")
yield (0, msg)

10
neutron/tests/unit/cmd/test_netns_cleanup.py
View File

@ -67,8 +67,8 @@ class TestNetnsCleanup(base.BaseTestCase):
with mock.patch('neutron.agent.linux.ip_lib.IPWrapper') as ip_wrap:
ip_wrap.return_value.namespace_is_empty.return_value = is_empty
self.assertEqual(util.eligible_for_deletion(conf, ns, force),
expected)
self.assertEqual(expected,
util.eligible_for_deletion(conf, ns, force))
expected_calls = [mock.call(namespace=ns)]
if not force:
@ -101,10 +101,8 @@ class TestNetnsCleanup(base.BaseTestCase):
with mock.patch('neutron.agent.linux.ip_lib.IPWrapper') as ip_wrap:
ip_wrap.return_value.namespace_is_empty.return_value = True
self.assertEqual(True,
util.eligible_for_deletion(conf, ns_dhcp, False))
self.assertEqual(False,
util.eligible_for_deletion(conf, ns_l3, False))
self.assertTrue(util.eligible_for_deletion(conf, ns_dhcp, False))
self.assertFalse(util.eligible_for_deletion(conf, ns_l3, False))
expected_calls = [mock.call(namespace=ns_dhcp),
mock.call().namespace_is_empty()]