refactor: make API private and return list of ignored files

This will let users know exactly which files have
been ignored in case multiple of them contain pytest
configuration.

Author: sgaist

src/_pytest/config/__init__.py

@@ -1107,14 +1107,6 @@ def inipath(self) -> pathlib.Path | None:
         """
         return self._inipath
 
-    @property
-    def should_warn(self) -> bool:
-        """Whether a warning should be emitted for the configuration.
-
-        .. versionadded:: 8.6
-        """
-        return self._should_warn
-
     def add_cleanup(self, func: Callable[[], None]) -> None:
         """Add a function to be called when the config object gets out of
         use (usually coinciding with pytest_unconfigure).
@@ -1250,15 +1242,15 @@ def _initini(self, args: Sequence[str]) -> None:
         ns, unknown_args = self._parser.parse_known_and_unknown_args(
             args, namespace=copy.copy(self.option)
         )
-        rootpath, inipath, inicfg, should_warn = determine_setup(
+        rootpath, inipath, inicfg, ignored_files = determine_setup(
             inifile=ns.inifilename,
             args=ns.file_or_dir + unknown_args,
             rootdir_cmd_arg=ns.rootdir or None,
             invocation_dir=self.invocation_params.dir,
         )
         self._rootpath = rootpath
         self._inipath = inipath
-        self._should_warn = should_warn
+        self._ignored_files = ignored_files
         self.inicfg = inicfg
         self._parser.extra_info["rootdir"] = str(self.rootpath)
         self._parser.extra_info["inifile"] = str(self.inipath)

src/_pytest/config/findpaths.py

@@ -91,7 +91,7 @@ def make_scalar(v: object) -> str | list[str]:
 def locate_config(
     invocation_dir: Path,
     args: Iterable[Path],
-) -> tuple[Path | None, Path | None, ConfigDict, bool]:
+) -> tuple[Path | None, Path | None, ConfigDict, list[str]]:
     """Search in the list of arguments for a valid ini-file for pytest,
     and return a tuple of (rootdir, inifile, cfg-dict)."""
     config_names = [
@@ -105,6 +105,7 @@ def locate_config(
     if not args:
         args = [invocation_dir]
     found_pyproject_toml: Path | None = None
+    ignored_files: list[str] = []
 
     for arg in args:
         argpath = absolutepath(arg)
@@ -116,17 +117,17 @@ def locate_config(
                         found_pyproject_toml = p
                     ini_config = load_config_dict_from_file(p)
                     if ini_config is not None:
-                        should_warn = False
-                        if ".ini" in p.suffixes:
-                            pyproject = base / "pyproject.toml"
-                            if pyproject.is_file():
-                                should_warn = (
-                                    load_config_dict_from_file(pyproject) is not None
-                                )
-                        return base, p, ini_config, should_warn
+                        index = config_names.index(config_name)
+                        if index < len(config_names) - 1:
+                            for remainder in config_names[index + 1 :]:
+                                p2 = base / remainder
+                                if p2.is_file():
+                                    if load_config_dict_from_file(p2) is not None:
+                                        ignored_files.append(remainder)
+                        return base, p, ini_config, ignored_files
     if found_pyproject_toml is not None:
-        return found_pyproject_toml.parent, found_pyproject_toml, {}, False
-    return None, None, {}, False
+        return found_pyproject_toml.parent, found_pyproject_toml, {}, []
+    return None, None, {}, []
 
 
 def get_common_ancestor(
@@ -186,7 +187,7 @@ def determine_setup(
     args: Sequence[str],
     rootdir_cmd_arg: str | None,
     invocation_dir: Path,
-) -> tuple[Path, Path | None, ConfigDict, bool]:
+) -> tuple[Path, Path | None, ConfigDict, list[str]]:
     """Determine the rootdir, inifile and ini configuration values from the
     command line arguments.
 
@@ -201,7 +202,8 @@ def determine_setup(
     """
     rootdir = None
     dirs = get_dirs_from_args(args)
-    should_warn = False
+    ignored_files: list[str] = []
+
     if inifile:
         inipath_ = absolutepath(inifile)
         inipath: Path | None = inipath_
@@ -210,7 +212,7 @@ def determine_setup(
             rootdir = inipath_.parent
     else:
         ancestor = get_common_ancestor(invocation_dir, dirs)
-        rootdir, inipath, inicfg, should_warn = locate_config(
+        rootdir, inipath, inicfg, ignored_files = locate_config(
             invocation_dir, [ancestor]
         )
         if rootdir is None and rootdir_cmd_arg is None:
@@ -234,7 +236,7 @@ def determine_setup(
                 f"Directory '{rootdir}' not found. Check your '--rootdir' option."
             )
     assert rootdir is not None
-    return rootdir, inipath, inicfg or {}, should_warn
+    return rootdir, inipath, inicfg or {}, ignored_files
 
 
 def is_fs_root(p: Path) -> bool:

src/_pytest/terminal.py

@@ -880,8 +880,8 @@ def pytest_report_header(self, config: Config) -> list[str]:
 
         if config.inipath:
             warning = ""
-            if config.should_warn:
-                warning = " (WARNING: ignoring pytest config in pyproject.toml!)"
+            if config._ignored_files:
+                warning = f" (WARNING: ignoring pytest config in {', '.join(config._ignored_files)}!)"
             result.append(
                 "configfile: " + bestrelpath(config.rootpath, config.inipath) + warning
             )

testing/test_terminal.py

@@ -2914,6 +2914,38 @@ def test_warning_when_init_trumps_pyproject_toml(
     )
 
 
+def test_warning_when_init_trumps_multiple_files(
+    pytester: Pytester, monkeypatch: MonkeyPatch
+) -> None:
+    """Regression test for #7814."""
+    tests = pytester.path.joinpath("tests")
+    tests.mkdir()
+    pytester.makepyprojecttoml(
+        f"""
+        [tool.pytest.ini_options]
+        testpaths = ['{tests}']
+    """
+    )
+    pytester.makefile(".ini", pytest="")
+    pytester.makeini(
+        """
+        # tox.ini
+        [pytest]
+        minversion = 6.0
+        addopts = -ra -q
+        testpaths =
+            tests
+            integration
+    """
+    )
+    result = pytester.runpytest()
+    result.stdout.fnmatch_lines(
+        [
+            "configfile: pytest.ini (WARNING: ignoring pytest config in pyproject.toml, tox.ini!)",
+        ]
+    )
+
+
 def test_no_warning_when_init_but_pyproject_toml_has_no_entry(
     pytester: Pytester, monkeypatch: MonkeyPatch
 ) -> None: