Improve tests and fix Mypy issues

Author: sadra-barikbin

src/_pytest/config/__init__.py

@@ -353,9 +353,9 @@ def _get_legacy_hook_marks(
     if TYPE_CHECKING:
         # abuse typeguard from importlib to avoid massive method type union thats lacking a alias
         assert inspect.isroutine(method)
-    known_marks: set[str] = {m.name for m in getattr(method, "pytestmark", [])}
-    must_warn: list[str] = []
-    opts: dict[str, bool] = {}
+    known_marks: Set[str] = {m.name for m in getattr(method, "pytestmark", [])}
+    must_warn: List[str] = []
+    opts: Dict[str, bool] = {}
     for opt_name in opt_names:
         opt_attr = getattr(method, opt_name, AttributeError)
         if opt_attr is not AttributeError:

src/_pytest/python.py

@@ -14,6 +14,7 @@
 from pathlib import Path
 from typing import Any
 from typing import Callable
+from typing import cast
 from typing import Dict
 from typing import final
 from typing import Generator
@@ -1221,7 +1222,7 @@ def resolve_values_indices_in_parametersets(
                 argname_indices.append(argvalues_count[argname])
                 argvalues_count[argname] += 1
         indices.append(argname_indices)
-    return list(zip(*indices))
+    return list(cast(Iterable[Tuple[int]], zip(*indices)))
 
 
 # Used for storing artificial fixturedefs for direct parametrization.
@@ -1378,7 +1379,9 @@ def parametrize(
         ids = self._resolve_parameter_set_ids(
             argnames, ids, parametersets, nodeid=self.definition.nodeid
         )
-        param_indices_list = resolve_values_indices_in_parametersets(argnames, parametersets)
+        param_indices_list = resolve_values_indices_in_parametersets(
+            argnames, parametersets
+        )
         # Store used (possibly generated) ids with parametrize Marks.
         if _param_mark and _param_mark._param_ids_from and generated_ids is None:
             object.__setattr__(_param_mark._param_ids_from, "_param_ids_generated", ids)
@@ -1389,7 +1392,7 @@ def parametrize(
         arg2fixturedefs = self._arg2fixturedefs
         node = None
         if scope_ is not Scope.Function:
-            node = get_scope_node(self.definition.parent, scope_)
+            node = get_scope_node(cast(nodes.Node, self.definition.parent), scope_)
             if node is None:
                 assert scope_ is Scope.Class and isinstance(
                     self.definition.parent, _pytest.python.Module

testing/python/fixtures.py

@@ -4511,33 +4511,3 @@ def test_fixt(custom):
     result.assert_outcomes(errors=1)
     result.stdout.fnmatch_lines([expected])
     assert result.ret == ExitCode.TESTS_FAILED
-
-
-def test_reorder_parametrized_tests_with_parametersets_with_duplicate_values(
-    pytester: Pytester,
-):
-    pytester.makepyfile(
-        """
-        import pytest
-
-        @pytest.fixture(scope='module')
-        def fixture1(request):
-            pass
-
-        @pytest.fixture(scope='module')
-        def fixture2(request):
-            pass
-
-        @pytest.mark.parametrize("fixture1, fixture2", [("a", 0), ("b", 1), ("a", 2)], indirect=True)
-        def test(fixture1, fixture2):
-            pass
-    """
-    )
-    result = pytester.runpytest("--collect-only")
-    result.stdout.re_match_lines(
-        [
-            r"  <Function test\[a-0\]>",
-            r"  <Function test\[a-2\]>",
-            r"  <Function test\[b-1\]>",
-        ]
-    )

testing/python/metafunc.py

@@ -33,7 +33,7 @@ def Metafunc(self, func, config=None) -> python.Metafunc:
         # on the funcarg level, so we don't need a full blown
         # initialization.
         class FuncFixtureInfoMock:
-            name2fixturedefs = {}
+            name2fixturedefs: Dict[str, List[fixtures.FixtureDef[object]]] = {}
 
             def __init__(self, names):
                 self.names_closure = names
@@ -983,6 +983,69 @@ def test_parametrize_with_duplicate_values(self) -> None:
         assert metafunc._calls[2].indices == dict(x=0, y=2)
         assert metafunc._calls[3].indices == dict(x=2, y=0)
 
+    def test_high_scoped_parametrize_reordering(self, pytester: Pytester) -> None:
+        pytester.makepyfile(
+            """
+            import pytest
+
+            @pytest.mark.parametrize("arg2", [3, 4])
+            @pytest.mark.parametrize("arg1", [0, 1, 2], scope='module')
+            def test1(arg1, arg2):
+                pass
+
+            def test2():
+                pass
+
+            @pytest.mark.parametrize("arg1", [0, 1, 2], scope='module')
+            def test3(arg1):
+                pass
+        """
+        )
+        result = pytester.runpytest("--collect-only")
+        result.stdout.re_match_lines(
+            [
+                r"  <Function test1\[0-3\]>",
+                r"  <Function test1\[0-4\]>",
+                r"  <Function test3\[0\]>",
+                r"  <Function test1\[1-3\]>",
+                r"  <Function test1\[1-4\]>",
+                r"  <Function test3\[1\]>",
+                r"  <Function test1\[2-3\]>",
+                r"  <Function test1\[2-4\]>",
+                r"  <Function test3\[2\]>",
+                r"  <Function test2>",
+            ]
+        )
+
+    def test_high_scoped_parametrize_with_duplicate_values_reordering(
+        self, pytester: Pytester
+    ) -> None:
+        pytester.makepyfile(
+            """
+            import pytest
+
+            @pytest.fixture(scope='module')
+            def fixture1(request):
+                pass
+
+            @pytest.fixture(scope='module')
+            def fixture2(request):
+                pass
+
+            @pytest.mark.parametrize("fixture1, fixture2", [("a", 0), ("b", 1), ("a", 2)], indirect=True)
+            def test(fixture1, fixture2):
+                pass
+        """
+        )
+        result = pytester.runpytest("--collect-only")
+        result.stdout.re_match_lines(
+            [
+                r"  <Function test\[a-0\]>",
+                r"  <Function test\[a-2\]>",
+                r"  <Function test\[b-1\]>",
+            ]
+        )
+
     def test_parametrize_multiple_times(self, pytester: Pytester) -> None:
         pytester.makepyfile(
             """
@@ -1504,8 +1567,10 @@ def test_foo(x):
                 "*= no tests collected, 1 error in *",
             ]
         )
-    
-    def test_parametrize_module_level_test_with_class_scope(self, pytester: Pytester) -> None:
+
+    def test_parametrize_module_level_test_with_class_scope(
+        self, pytester: Pytester
+    ) -> None:
         pytester.makepyfile(
             """
             import pytest
@@ -1520,7 +1585,7 @@ def item(request):
             def test_1(item, x):
                 global fixturedef
                 fixturedef = item._fixtureinfo.name2fixturedefs['x'][-1]
-            
+
             @pytest.mark.parametrize("x", [1, 2], scope="module")
             def test_2(item, x):
                 global fixturedef