Fix for test_addini_aliases_with_override_of_old

Author: bluetech

src/_pytest/config/__init__.py

@@ -1461,7 +1461,8 @@ def pytest_collection(self) -> Generator[None, object, object]:
     def _checkversion(self) -> None:
         import pytest
 
-        minver = self.inicfg.get("minversion", None)
+        minver_ini_value = self.inicfg.get("minversion", None)
+        minver = minver_ini_value.value if minver_ini_value is not None else None
         if minver:
             # Imported lazily to improve start-up time.
             from packaging.version import Version
@@ -1645,21 +1646,24 @@ def _getini(self, name: str):
         except KeyError as e:
             raise ValueError(f"unknown configuration value: {name!r}") from e
 
-        # Try to get value from inicfg, checking canonical name first, then aliases.
-        # Canonical name takes precedence over any aliases.
-        value = None
+        # Collect all possible values (canonical name + aliases) from inicfg.
+        # Each candidate is (IniValue, is_canonical).
+        candidates = []
         if canonical_name in self.inicfg:
-            value = self.inicfg[canonical_name]
-        else:
-            # Check if any alias for this canonical name exists in inicfg.
-            for alias, target in self._parser._ini_aliases.items():
-                if target == canonical_name and alias in self.inicfg:
-                    value = self.inicfg[alias]
-                    break
+            candidates.append((self.inicfg[canonical_name], True))
+        for alias, target in self._parser._ini_aliases.items():
+            if target == canonical_name and alias in self.inicfg:
+                candidates.append((self.inicfg[alias], False))
 
-        if value is None:
+        if not candidates:
             return default
 
+        # Pick the best candidate based on precedence:
+        # 1. CLI override takes precedence over file, then
+        # 2. Canonical name takes precedence over alias.
+        ini_value = max(candidates, key=lambda x: (x[0].origin == "override", x[1]))[0]
+        value = ini_value.value
+
         # Coerce the values based on types.
         #
         # Note: some coercions are only required if we are reading from .ini files, because

src/_pytest/config/findpaths.py

@@ -2,9 +2,11 @@
 
 from collections.abc import Iterable
 from collections.abc import Sequence
+from dataclasses import dataclass
 import os
 from pathlib import Path
 import sys
+from typing import Literal
 from typing import TypeAlias
 
 import iniconfig
@@ -16,9 +18,23 @@
 from _pytest.pathlib import safe_exists
 
 
-# Even though TOML supports richer data types, all values are converted to str/list[str] during
-# parsing to maintain compatibility with the rest of the configuration system.
-ConfigDict: TypeAlias = dict[str, str | list[str]]
+@dataclass(frozen=True)
+class IniValue:
+    """Represents an ini configuration value with its origin.
+
+    This allows tracking whether a value came from a configuration file
+    or from a CLI override (--override-ini), which is important for
+    determining precedence when dealing with ini option aliases.
+    """
+
+    # Even though TOML supports richer data types, all values are converted to
+    # str/list[str] during parsing to maintain compatibility with the rest of
+    # the configuration system.
+    value: str | list[str]
+    origin: Literal["file", "override"]
+
+
+ConfigDict: TypeAlias = dict[str, IniValue]
 
 
 def _parse_ini_config(path: Path) -> iniconfig.IniConfig:
@@ -45,7 +61,7 @@ def load_config_dict_from_file(
         iniconfig = _parse_ini_config(filepath)
 
         if "pytest" in iniconfig:
-            return dict(iniconfig["pytest"].items())
+            return {k: IniValue(v, "file") for k, v in iniconfig["pytest"].items()}
         else:
             # "pytest.ini" files are always the source of configuration, even if empty.
             if filepath.name == "pytest.ini":
@@ -56,7 +72,7 @@ def load_config_dict_from_file(
         iniconfig = _parse_ini_config(filepath)
 
         if "tool:pytest" in iniconfig.sections:
-            return dict(iniconfig["tool:pytest"].items())
+            return {k: IniValue(v, "file") for k, v in iniconfig["tool:pytest"].items()}
         elif "pytest" in iniconfig.sections:
             # If a setup.cfg contains a "[pytest]" section, we raise a failure to indicate users that
             # plain "[pytest]" sections in setup.cfg files is no longer supported (#3086).
@@ -83,7 +99,7 @@ def load_config_dict_from_file(
             def make_scalar(v: object) -> str | list[str]:
                 return v if isinstance(v, list) else str(v)
 
-            return {k: make_scalar(v) for k, v in result.items()}
+            return {k: IniValue(make_scalar(v), "file") for k, v in result.items()}
 
     return None
 
@@ -181,7 +197,7 @@ def get_dir_from_path(path: Path) -> Path:
     return [get_dir_from_path(path) for path in possible_paths if safe_exists(path)]
 
 
-def parse_override_ini(override_ini: Sequence[str] | None) -> dict[str, str]:
+def parse_override_ini(override_ini: Sequence[str] | None) -> ConfigDict:
     """Parse the -o/--override-ini command line arguments and return the overrides.
 
     :raises UsageError:
@@ -199,7 +215,7 @@ def parse_override_ini(override_ini: Sequence[str] | None) -> dict[str, str]:
                 f"-o/--override-ini expects option=value style (got: {ini_config!r})."
             ) from e
         else:
-            overrides[key] = user_ini_value
+            overrides[key] = IniValue(user_ini_value, "override")
     return overrides
 
 

testing/test_config.py

@@ -25,6 +25,7 @@
 from _pytest.config.exceptions import UsageError
 from _pytest.config.findpaths import determine_setup
 from _pytest.config.findpaths import get_common_ancestor
+from _pytest.config.findpaths import IniValue
 from _pytest.config.findpaths import locate_config
 from _pytest.monkeypatch import MonkeyPatch
 from _pytest.pathlib import absolutepath
@@ -57,9 +58,9 @@ def test_getcfg_and_config(
             encoding="utf-8",
         )
         _, _, cfg, _ = locate_config(Path.cwd(), [sub])
-        assert cfg["name"] == "value"
+        assert cfg["name"] == IniValue("value", "file")
         config = pytester.parseconfigure(str(sub))
-        assert config.inicfg["name"] == "value"
+        assert config.inicfg["name"] == IniValue("value", "file")
 
     def test_setupcfg_uses_toolpytest_with_pytest(self, pytester: Pytester) -> None:
         p1 = pytester.makepyfile("def test(): pass")
@@ -1313,7 +1314,7 @@ def test_inifilename(self, tmp_path: Path) -> None:
 
         # this indicates this is the file used for getting configuration values
         assert config.inipath == inipath
-        assert config.inicfg.get("name") == "value"
+        assert config.inicfg.get("name") == IniValue("value", "file")
         assert config.inicfg.get("should_not_be_set") is None
 
 
@@ -1807,7 +1808,7 @@ def test_with_ini(self, tmp_path: Path, name: str, contents: str) -> None:
         )
         assert rootpath == tmp_path
         assert parsed_inipath == inipath
-        assert ini_config == {"x": "10"}
+        assert ini_config["x"] == IniValue("10", "file")
 
     @pytest.mark.parametrize("name", ["setup.cfg", "tox.ini"])
     def test_pytestini_overrides_empty_other(self, tmp_path: Path, name: str) -> None:
@@ -1881,7 +1882,7 @@ def test_with_specific_inifile(
         )
         assert rootpath == tmp_path
         assert inipath == p
-        assert ini_config == {"x": "10"}
+        assert ini_config["x"] == IniValue("10", "file")
 
     def test_explicit_config_file_sets_rootdir(
         self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
@@ -2151,7 +2152,7 @@ def test_addopts_before_initini(
         monkeypatch.setenv("PYTEST_ADDOPTS", f"-o cache_dir={cache_dir}")
         config = _config_for_test
         config._preparse([], addopts=True)
-        assert config.inicfg.get("cache_dir") == cache_dir
+        assert config.inicfg.get("cache_dir") == IniValue(cache_dir, "override")
 
     def test_addopts_from_env_not_concatenated(
         self, monkeypatch: MonkeyPatch, _config_for_test
@@ -2189,7 +2190,7 @@ def test_override_ini_does_not_contain_paths(
         """Check that -o no longer swallows all options after it (#3103)"""
         config = _config_for_test
         config._preparse(["-o", "cache_dir=/cache", "/some/test/path"])
-        assert config.inicfg.get("cache_dir") == "/cache"
+        assert config.inicfg.get("cache_dir") == IniValue("/cache", "override")
 
     def test_multiple_override_ini_options(self, pytester: Pytester) -> None:
         """Ensure a file path following a '-o' option does not generate an error (#3103)"""

testing/test_findpaths.py

@@ -8,6 +8,7 @@
 from _pytest.config import UsageError
 from _pytest.config.findpaths import get_common_ancestor
 from _pytest.config.findpaths import get_dirs_from_args
+from _pytest.config.findpaths import IniValue
 from _pytest.config.findpaths import is_fs_root
 from _pytest.config.findpaths import load_config_dict_from_file
 import pytest
@@ -24,13 +25,13 @@ def test_pytest_ini(self, tmp_path: Path) -> None:
         """[pytest] section in pytest.ini files is read correctly"""
         fn = tmp_path / "pytest.ini"
         fn.write_text("[pytest]\nx=1", encoding="utf-8")
-        assert load_config_dict_from_file(fn) == {"x": "1"}
+        assert load_config_dict_from_file(fn) == {"x": IniValue("1", "file")}
 
     def test_custom_ini(self, tmp_path: Path) -> None:
         """[pytest] section in any .ini file is read correctly"""
         fn = tmp_path / "custom.ini"
         fn.write_text("[pytest]\nx=1", encoding="utf-8")
-        assert load_config_dict_from_file(fn) == {"x": "1"}
+        assert load_config_dict_from_file(fn) == {"x": IniValue("1", "file")}
 
     def test_custom_ini_without_section(self, tmp_path: Path) -> None:
         """Custom .ini files without [pytest] section are not considered for configuration"""
@@ -48,7 +49,7 @@ def test_valid_cfg_file(self, tmp_path: Path) -> None:
         """Custom .cfg files with [tool:pytest] section are read correctly"""
         fn = tmp_path / "custom.cfg"
         fn.write_text("[tool:pytest]\nx=1", encoding="utf-8")
-        assert load_config_dict_from_file(fn) == {"x": "1"}
+        assert load_config_dict_from_file(fn) == {"x": IniValue("1", "file")}
 
     def test_unsupported_pytest_section_in_cfg_file(self, tmp_path: Path) -> None:
         """.cfg files with [pytest] section are no longer supported and should fail to alert users"""
@@ -96,11 +97,11 @@ def test_valid_toml_file(self, tmp_path: Path) -> None:
             encoding="utf-8",
         )
         assert load_config_dict_from_file(fn) == {
-            "x": "1",
-            "y": "20.0",
-            "values": ["tests", "integration"],
-            "name": "foo",
-            "heterogeneous_array": [1, "str"],
+            "x": IniValue("1", "file"),
+            "y": IniValue("20.0", "file"),
+            "values": IniValue(["tests", "integration"], "file"),
+            "name": IniValue("foo", "file"),
+            "heterogeneous_array": IniValue([1, "str"], "file"),  # type: ignore[list-item]
         }