Make nsp/nate/better-unused-argument merge-able with origin/master

Signed-off-by: Stavros Ntentos <[email protected]>
stdedos · Oct 23, 2023 · 360461c · 360461c
1 parent bb0b523
commit 360461c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/pylint_pytest/checkers/fixture.py b/pylint_pytest/checkers/fixture.py
@@ -196,7 +196,7 @@ def visit_functiondef(self, node):
             for arg in node.args.args:
                 self._invoked_with_func_args.add(arg.name)
 
-    # pylint: disable=protected-access,bad-staticmethod-argument
+    # pylint: disable=bad-staticmethod-argument,too-many-branches # The function itself is an if-return logic.
     @staticmethod
     def patch_add_message(self, msgid, line=None, node=None, args=None,
                           confidence=None, col_offset=None):
@@ -238,16 +238,22 @@ def patch_add_message(self, msgid, line=None, node=None, args=None,
                     return
 
         # check W0613 unused-argument
-        if msgid == 'unused-argument':
-            if _can_use_fixture(node.parent.parent):
-                if isinstance(node.parent, astroid.Arguments):
-                    if node.name in FixtureChecker._pytest_fixtures:
-                        return  # argument is used as a fixture
-                    else:
-                        fixnames = (arg.name for arg in node.parent.args if arg.name in FixtureChecker._pytest_fixtures)
-                        for fixname in fixnames:
-                            if node.name in FixtureChecker._pytest_fixtures[fixname][0].argnames:
-                                return  # argument is used by a fixture
+        if (
+            msgid == "unused-argument"
+            and _can_use_fixture(node.parent.parent)
+            and isinstance(node.parent, astroid.Arguments)
+        ):
+            if node.name in FixtureChecker._pytest_fixtures:
+                # argument is used as a fixture
+                return
+
+            fixnames = (
+                arg.name for arg in node.parent.args if arg.name in FixtureChecker._pytest_fixtures
+            )
+            for fixname in fixnames:
+                if node.name in FixtureChecker._pytest_fixtures[fixname][0].argnames:
+                    # argument is used by a fixture
+                    return
 
         # check W0621 redefined-outer-name
         if msgid == 'redefined-outer-name' and \

diff --git a/tests/input/unused-argument/func_param_as_fixture_arg.py b/tests/input/unused-argument/func_param_as_fixture_arg.py
@@ -18,6 +18,7 @@ def test_myfix(myfix, arg):
     """A test function that uses the param through a fixture"""
     assert myfix
 
+
 @pytest.mark.parametrize("narg", [4, 5, 6])
 def test_nyfix(narg):  # unused-argument
     """A test function that does not use its param"""

diff --git a/tests/test_unused_argument.py b/tests/test_unused_argument.py
@@ -7,29 +7,29 @@
 class TestUnusedArgument(BasePytestTester):
     CHECKER_CLASS = FixtureChecker
     IMPACTED_CHECKER_CLASSES = [VariablesChecker]
-    MSG_ID = 'unused-argument'
+    MSG_ID = "unused-argument"
 
-    @pytest.mark.parametrize('enable_plugin', [True, False])
+    @pytest.mark.parametrize("enable_plugin", [True, False])
     def test_smoke(self, enable_plugin):
         self.run_linter(enable_plugin)
         self.verify_messages(0 if enable_plugin else 2)
 
-    @pytest.mark.parametrize('enable_plugin', [True, False])
+    @pytest.mark.parametrize("enable_plugin", [True, False])
     def test_caller_yield_fixture(self, enable_plugin):
         self.run_linter(enable_plugin)
         self.verify_messages(0 if enable_plugin else 1)
 
-    @pytest.mark.parametrize('enable_plugin', [True, False])
+    @pytest.mark.parametrize("enable_plugin", [True, False])
     def test_caller_not_a_test_func(self, enable_plugin):
         self.run_linter(enable_plugin)
         self.verify_messages(1)
 
-    @pytest.mark.parametrize('enable_plugin', [True, False])
+    @pytest.mark.parametrize("enable_plugin", [True, False])
     def test_args_and_kwargs(self, enable_plugin):
         self.run_linter(enable_plugin)
         self.verify_messages(2)
 
-    @pytest.mark.parametrize('enable_plugin', [True, False])
+    @pytest.mark.parametrize("enable_plugin", [True, False])
     def test_func_param_as_fixture_arg(self, enable_plugin):
         self.run_linter(enable_plugin)
         self.verify_messages(1 if enable_plugin else 2)