openstack/rally-openstack
Code Issues Proposed changes

Merge "replace assertNotEqual(*,None) to assertIsNotNone"

Browse Source
This commit is contained in:
Jenkins 2016-07-27 17:56:57 +00:00 committed by Gerrit Code Review
commit 9de60c1f68
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/hacking/README.rst
View File

@ -21,6 +21,7 @@ Rally Specific Commandments
* [N322] - Ensure that ``assertEqual(A, None)`` and ``assertEqual(None, A)`` are not used * [N322] - Ensure that ``assertEqual(A, None)`` and ``assertEqual(None, A)`` are not used
* [N323] - Ensure that ``assertTrue/assertFalse(A in/not in B)`` are not used with collection contents * [N323] - Ensure that ``assertTrue/assertFalse(A in/not in B)`` are not used with collection contents
* [N324] - Ensure that ``assertEqual(A in/not in B, True/False)`` and ``assertEqual(True/False, A in/not in B)`` are not used with collection contents * [N324] - Ensure that ``assertEqual(A in/not in B, True/False)`` and ``assertEqual(True/False, A in/not in B)`` are not used with collection contents
* [N325] - Ensure that ``assertNotEqual(A, None)`` and ``assertNotEqual(None, A)`` are not used
* [N340] - Ensure that we are importing always ``from rally import objects`` * [N340] - Ensure that we are importing always ``from rally import objects``
* [N341] - Ensure that we are importing oslo_xyz packages instead of deprecated oslo.xyz ones * [N341] - Ensure that we are importing oslo_xyz packages instead of deprecated oslo.xyz ones
* [N350] - Ensure that single quotes are not used * [N350] - Ensure that single quotes are not used

17
tests/hacking/checks.py
View File

@ -36,6 +36,9 @@ re_assert_equal_type = re.compile(
r"(\w|\.|\'|\"|\[|\])+\)") r"(\w|\.|\'|\"|\[|\])+\)")
re_assert_equal_end_with_none = re.compile(r"assertEqual\(.*?,\s+None\)$") re_assert_equal_end_with_none = re.compile(r"assertEqual\(.*?,\s+None\)$")
re_assert_equal_start_with_none = re.compile(r"assertEqual\(None,") re_assert_equal_start_with_none = re.compile(r"assertEqual\(None,")
re_assert_not_equal_end_with_none = re.compile(
r"assertNotEqual\(.*?,\s+None\)$")
re_assert_not_equal_start_with_none = re.compile(r"assertNotEqual\(None,")
re_assert_true_false_with_in_or_not_in = re.compile( re_assert_true_false_with_in_or_not_in = re.compile(
r"assert(True|False)\(" r"assert(True|False)\("
r"(\w|[][.'\"])+( not)? in (\w|[][.'\",])+(, .*)?\)") r"(\w|[][.'\"])+( not)? in (\w|[][.'\",])+(, .*)?\)")
@ -278,6 +281,20 @@ def assert_equal_in(logical_line, physical_line, filename):
"collection contents.") "collection contents.")
@skip_ignored_lines
def assert_not_equal_none(logical_line, physical_line, filename):
"""Check for assertNotEqual(A, None) or assertEqual(None, A) sentences
N325
"""
res = (re_assert_not_equal_start_with_none.search(logical_line) or
re_assert_not_equal_end_with_none.search(logical_line))
if res:
yield (0, "N325 assertNotEqual(A, None) or assertNotEqual(None, A) "
"sentences not allowed, you should use assertIsNotNone(A) "
"instead.")
@skip_ignored_lines @skip_ignored_lines
def check_no_direct_rally_objects_import(logical_line, physical_line, def check_no_direct_rally_objects_import(logical_line, physical_line,
filename): filename):

11
tests/unit/test_hacking.py
View File

@ -170,6 +170,17 @@ class HackingTestCase(test.TestCase):
self.assertEqual( self.assertEqual(
len(list(checks.assert_equal_none(line, line, "f"))), result) len(list(checks.assert_equal_none(line, line, "f"))), result)
@ddt.data(
{"line": "self.assertNotEqual(A, None)", "result": 1},
{"line": "self.assertNotEqual(None, A)", "result": 1},
{"line": "self.assertIsNotNone()", "result": 0}
)
@ddt.unpack
def test_assert_not_equal_none(self, line, result):
self.assertEqual(
len(list(checks.assert_not_equal_none(line, line, "f"))), result)
def test_assert_true_or_false_with_in_or_not_in(self): def test_assert_true_or_false_with_in_or_not_in(self):
good_lines = [ good_lines = [
"self.assertTrue(any(A > 5 for A in B))", "self.assertTrue(any(A > 5 for A in B))",