Fix tests and typing

Author: nicoddemus

src/_pytest/config/__init__.py

@@ -33,6 +33,7 @@
 from typing import IO
 from typing import TextIO
 from typing import TYPE_CHECKING
+from typing import Union
 import warnings
 
 import pluggy
@@ -1645,6 +1646,7 @@ def _getini(self, name: str):
                 if self.inipath is not None
                 else self.invocation_params.dir
             )
+            value = cast(Union[str, list[str]], value)
             input_values = shlex.split(value) if isinstance(value, str) else value
             return [dp / x for x in input_values]
         elif type == "args":
@@ -1659,13 +1661,15 @@ def _getini(self, name: str):
         elif type == "string":
             return value
         elif type == "int":
+            value = cast(str, value)
             try:
                 return int(value)
             except ValueError:
                 raise ValueError(
                     f"invalid integer value for option {name}: {value!r}"
                 ) from None
         elif type == "float":
+            value = cast(str, value)
             try:
                 return float(value)
             except ValueError:
@@ -1675,6 +1679,7 @@ def _getini(self, name: str):
         elif type is None:
             return value
         else:
+            value = cast(Union[str, list[str]], value)
             return self._getini_unknown_type(name, type, value)
 
     def _getconftest_pathlist(

src/_pytest/config/findpaths.py

@@ -5,6 +5,7 @@
 import os
 from pathlib import Path
 import sys
+from typing import TYPE_CHECKING
 
 import iniconfig
 
@@ -15,6 +16,14 @@
 from _pytest.pathlib import safe_exists
 
 
+if TYPE_CHECKING:
+    from typing import Union
+
+    from typing_extensions import TypeAlias
+
+    ConfigDict: TypeAlias = dict[str, Union[str, int, float, list[str]]]
+
+
 def _parse_ini_config(path: Path) -> iniconfig.IniConfig:
     """Parse the given generic '.ini' file using legacy IniConfig parser, returning
     the parsed object.
@@ -29,7 +38,7 @@ def _parse_ini_config(path: Path) -> iniconfig.IniConfig:
 
 def load_config_dict_from_file(
     filepath: Path,
-) -> dict[str, str | list[str]] | None:
+) -> ConfigDict | None:
     """Load pytest configuration from the given file path, if supported.
 
     Return None if the file does not contain valid pytest configuration.
@@ -85,7 +94,7 @@ def make_scalar(v: object) -> str | list[str]:
 def locate_config(
     invocation_dir: Path,
     args: Iterable[Path],
-) -> tuple[Path | None, Path | None, dict[str, str | list[str]]]:
+) -> tuple[Path | None, Path | None, ConfigDict]:
     """Search in the list of arguments for a valid ini-file for pytest,
     and return a tuple of (rootdir, inifile, cfg-dict)."""
     config_names = [
@@ -172,7 +181,7 @@ def determine_setup(
     args: Sequence[str],
     rootdir_cmd_arg: str | None,
     invocation_dir: Path,
-) -> tuple[Path, Path | None, dict[str, int | float | str | list[str]]]:
+) -> tuple[Path, Path | None, ConfigDict]:
     """Determine the rootdir, inifile and ini configuration values from the
     command line arguments.
 

testing/test_config.py

@@ -848,7 +848,7 @@ def pytest_addoption(parser):
         config = pytester.parseconfig()
         assert config.getini("strip") is bool_val
 
-    @pytest.mark.parametrize("str_val, int_val", [("10", 10), ("no-ini", 0)])
+    @pytest.mark.parametrize("str_val, int_val", [("10", 10), ("no-ini", 2)])
     def test_addini_int(self, pytester: Pytester, str_val: str, int_val: bool) -> None:
         pytester.makeconftest(
             """
@@ -866,7 +866,7 @@ def pytest_addoption(parser):
         config = pytester.parseconfig()
         assert config.getini("ini_param") == int_val
 
-    @pytest.mark.parametrize("str_val, float_val", [("10.5", 10.5), ("no-ini", 0.0)])
+    @pytest.mark.parametrize("str_val, float_val", [("10.5", 10.5), ("no-ini", 2.2)])
     def test_addini_float(
         self, pytester: Pytester, str_val: str, float_val: bool
     ) -> None: