Appeases the majority of mypy. Prepping to use ParamSpec in ExpandedType

56kyle · Aug 31, 2023 · 757bebf · 757bebf
1 parent b44dde9
commit 757bebf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/pytest_static/parametric.py b/src/pytest_static/parametric.py
@@ -186,7 +186,9 @@ def parametrize_types(
     instance_sets: List[List[T]] = [
         list(get_all_possible_type_instances(t)) for t in argtypes
     ]
-    instance_combinations: List[List[T]] = list(itertools.product(*instance_sets))
+    instance_combinations: List[Iterable[itertools.product[Tuple[Any, ...]]]] = list(
+        itertools.product(*instance_sets)
+    )
 
     if ids is None:
         ids = [", ".join(map(repr, ic)) for ic in instance_combinations]

diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py
@@ -28,7 +28,7 @@ def expanded_type(
 
 
 @pytest.fixture(scope="function")
-def primary_type(request: FixtureRequest) -> Type[T]:
+def primary_type(request: FixtureRequest) -> Type[Any]:
     return getattr(request, "param", List)
 
 

diff --git a/tests/unit_tests/test_parametric.py b/tests/unit_tests/test_parametric.py
@@ -87,16 +87,18 @@ def test_get_instances_with_multiple_nested(self, monkeypatch: MonkeyPatch) -> N
     def test__get_parameter_instance_sets(
         self,
         primary_type: Type[T],
-        type_args: Type[T],
+        type_args: Tuple[Union[Any, ExpandedType[Any]], ...],
         expected_sets: Tuple[Set[Any], ...],
     ) -> None:
-        expected_sets = [tuple(expected_set) for expected_set in expected_sets]
+        expected: List[Tuple[Any, ...]] = [
+            tuple(iter(expected_set)) for expected_set in expected_sets
+        ]
         assert (
             ExpandedType(
                 primary_type=primary_type,
                 type_args=type_args,
             )._get_parameter_instance_sets()
-            == expected_sets
+            == expected
         )
 
     @pytest.mark.parametrize(
@@ -128,7 +130,7 @@ def test__get_parameter_combinations(
         indirect=True,
     )
     def test__instantiate_each_parameter_combination_with_builtin(
-        self, expanded_type: ExpandedType
+        self, expanded_type: ExpandedType[Any]
     ) -> None:
         with pytest.raises(ValueError):
             expanded_type._instantiate_each_parameter_combination(
@@ -203,8 +205,8 @@ def test__instantiate_expanded(self) -> None:
     @pytest.mark.parametrize(
         argnames=["primary_type", "type_args", "combination"],
         argvalues=[
-            (list, (int,), (1,)),
-            (list, (int,), (1, 2)),
+            (list, (int,), (1, 2, 3)),
+            (list, (int, str), (1, "2", 3)),
         ],
         ids=[
             "single_type_arg",
@@ -214,11 +216,11 @@ def test__instantiate_expanded(self) -> None:
     )
     def test__instantiate_not_expanded(
         self,
-        expanded_type: ExpandedType,
+        expanded_type: ExpandedType[List[Any]],
         combination: Tuple[Any, ...],
     ) -> None:
         assert expanded_type._instantiate_not_expanded(
-            combination
+            combination=combination
         ) == expanded_type.primary_type(combination)