Merge "Remove duplicate hacking check"

HACKING.rst

@@ -9,7 +9,6 @@ Below you can find a list of checks specific to this repository.
 - [N328] Detect wrong usage with assertEqual
 - [N330] Use assertEqual(*empty*, observed) instead of
          assertEqual(observed, *empty*)
-- [N331] Detect wrong usage with assertTrue(isinstance()).
 - [N332] Use assertEqual(expected_http_code, observed_http_code) instead of
          assertEqual(observed_http_code, expected_http_code).
 - [N343] Production code must not import from ovn_octavia_provider.tests.*

ovn_octavia_provider/hacking/checks.py

@@ -112,18 +112,6 @@ def check_assertempty(logical_line, filename):
             yield (0, msg)
 
 
-@core.flake8ext
-def check_assertisinstance(logical_line, filename):
-    """N331 - Enforce using assertIsInstance."""
-
-    if 'ovn_octavia_provider/tests/' in filename:
-        if re.search(r"assertTrue\(\s*isinstance\(\s*[^,]*,\s*[^,]*\)\)",
-                     logical_line):
-            msg = ("N331: Use assertIsInstance(observed, type) instead "
-                   "of assertTrue(isinstance(observed, type))")
-            yield (0, msg)
-
-
 @core.flake8ext
 def check_assertequal_for_httpcode(logical_line, filename):
     """N332 - Enforce correct oredering for httpcode in assertEqual."""

ovn_octavia_provider/tests/unit/hacking/test_checks.py

@@ -188,29 +188,6 @@ class HackingTestCase(base.BaseTestCase):
                         pass_code2 % ec,
                         "ovn_octavia_provider/tests_fake/test_assert.py"))))
 
-    def test_assertisinstance(self):
-        fail_code = """
-               self.assertTrue(isinstance(observed, ANY_TYPE))
-               """
-        pass_code1 = """
-               self.assertEqual(ANY_TYPE, type(observed))
-               """
-        pass_code2 = """
-               self.assertIsInstance(observed, ANY_TYPE)
-               """
-        self.assertEqual(
-            1, len(list(checks.check_assertisinstance(fail_code,
-                        "ovn_octavia_provider/tests/test_assert.py"))))
-        self.assertEqual(
-            0, len(list(checks.check_assertisinstance(pass_code1,
-                        "ovn_octavia_provider/tests/test_assert.py"))))
-        self.assertEqual(
-            0, len(list(checks.check_assertisinstance(pass_code2,
-                        "ovn_octavia_provider/tests/test_assert.py"))))
-        self.assertEqual(
-            0, len(list(checks.check_assertisinstance(pass_code2,
-                        "ovn_octavia_provider/tests_fake/test_assert.py"))))
-
     def test_assertequal_for_httpcode(self):
         fail_code = """
                 self.assertEqual(res.status_int, webob.exc.HTTPNoContent.code)

tox.ini

@@ -119,7 +119,6 @@ extension =
   N322 = checks:check_assert_called_once_with
   N328 = checks:check_asserttruefalse
   N330 = checks:check_assertempty
-  N331 = checks:check_assertisinstance
   N332 = checks:check_assertequal_for_httpcode
   N343 = checks:check_no_imports_from_tests
   N344 = checks:check_python3_no_filter