Merge pull request #5486 from nicoddemus/backport-5483

[4.6] Pickup addition positional args passed to _parse_parametrize_ar… (#5483)

Author: nicoddemus

AUTHORS

@@ -135,6 +135,7 @@ Kale Kundert
 Katarzyna Jachim
 Katerina Koukiou
 Kevin Cox
+Kevin J. Foley
 Kodi B. Arfer
 Kostis Anagnostopoulos
 Kristoffer Nordström

changelog/5482.bugfix.rst

@@ -0,0 +1,2 @@
+Fix bug introduced in 4.6.0 causing collection errors when passing
+more than 2 positional arguments to ``pytest.mark.parametrize``.

src/_pytest/mark/structures.py

@@ -104,10 +104,7 @@ def extract_from(cls, parameterset, force_tuple=False):
             return cls(parameterset, marks=[], id=None)
 
     @staticmethod
-    def _parse_parametrize_args(argnames, argvalues, **_):
-        """It receives an ignored _ (kwargs) argument so this function can
-        take also calls from parametrize ignoring scope, indirect, and other
-        arguments..."""
+    def _parse_parametrize_args(argnames, argvalues, *args, **kwargs):
         if not isinstance(argnames, (tuple, list)):
             argnames = [x.strip() for x in argnames.split(",") if x.strip()]
             force_tuple = len(argnames) == 1

testing/python/metafunc.py

@@ -1765,3 +1765,16 @@ def test_func_b(y):
         result.stdout.fnmatch_lines(
             ["*test_func_a*0*PASS*", "*test_func_a*2*PASS*", "*test_func_b*10*PASS*"]
         )
+
+    def test_parametrize_positional_args(self, testdir):
+        testdir.makepyfile(
+            """
+            import pytest
+
+            @pytest.mark.parametrize("a", [1], False)
+            def test_foo(a):
+                pass
+        """
+        )
+        result = testdir.runpytest()
+        result.assert_outcomes(passed=1)