Use normcase(conftest_path) as registration name

Author: lesteve

src/_pytest/config/__init__.py

@@ -63,6 +63,7 @@
 from _pytest.pathlib import safe_exists
 from _pytest.stash import Stash
 from _pytest.warning_types import PytestConfigWarning
+from _pytest.warning_types import PytestDeprecationWarning
 from _pytest.warning_types import warn_explicit_for
 
 if TYPE_CHECKING:
@@ -634,10 +635,8 @@ def _rget_with_confmod(
     def _importconftest(
         self, conftestpath: Path, importmode: Union[str, ImportMode], rootpath: Path
     ) -> types.ModuleType:
-        # Avoid inconsistent path issues on Windows, see
-        # https://github.com/pytest-dev/pytest/issues/9765
-        normalized_conftestpath = os.path.normcase(conftestpath)
-        existing = self.get_plugin(normalized_conftestpath)
+        conftestpath_str = str(conftestpath)
+        existing = self.get_plugin(conftestpath_str)
         if existing is not None:
             return cast(types.ModuleType, existing)
 
@@ -662,7 +661,7 @@ def _importconftest(
                     assert mod not in mods
                     mods.append(mod)
         self.trace(f"loading conftestmodule {mod!r}")
-        self.consider_conftest(mod)
+        self.consider_conftest(mod, registration_name=conftestpath_str)
         return mod
 
     def _check_non_top_pytest_plugins(
@@ -742,13 +741,19 @@ def consider_pluginarg(self, arg: str) -> None:
                     del self._name2plugin["pytest_" + name]
             self.import_plugin(arg, consider_entry_points=True)
 
-    def consider_conftest(self, conftestmodule: types.ModuleType) -> None:
+    def consider_conftest(
+        self, conftestmodule: types.ModuleType, registration_name: Optional[str] = None
+    ) -> None:
         """:meta private:"""
-        name = conftestmodule.__file__
-        # Avoid inconsistent path issues on Windows, see
-        # https://github.com/pytest-dev/pytest/issues/9765
-        normalized_name = name if name is None else os.path.normcase(name)
-        self.register(conftestmodule, name=normalized_name)
+        if registration_name is None:
+            warnings.warn(
+                "'consider_conftest' was called with registration_name=None, this will become an error in the future'",
+                PytestDeprecationWarning,
+            )
+            # Keep Pytest < 8 previous behaviour
+            registration_name = conftestmodule.__file__
+
+        self.register(conftestmodule, name=registration_name)
 
     def consider_env(self) -> None:
         """:meta private:"""

testing/test_conftest.py

@@ -212,7 +212,7 @@ def test_setinitial_conftest_subdirs(pytester: Pytester, name: str) -> None:
     subconftest.touch()
     pm = PytestPluginManager()
     conftest_setinitial(pm, [sub.parent], confcutdir=pytester.path)
-    key = os.path.normcase(subconftest.resolve())
+    key = str(subconftest.resolve())
     if name not in ("whatever", ".dotdir"):
         assert pm.has_plugin(key)
         assert len(set(pm.get_plugins()) - {pm}) == 1

testing/test_pluginmanager.py

@@ -103,32 +103,28 @@ def pytest_configure(self):
         reason="requires a case-insensitive file system",
     )
     def test_conftestpath_case_sensitivity(self, pytester: Pytester) -> None:
-        """Non-regression test for https://github.com/pytest-dev/pytest/issues/9765
-
-        Ensures that the conftests are registered in the plugin dictionary with a key
-        that does not depend on the case of the input path if the filesystem is
-        case-insensitive.
-        """
-
         config = pytester.parseconfig()
         pytester.makepyfile(**{"tests/conftest.py": ""})
 
         conftest = pytester.path.joinpath("tests/conftest.py")
-        conftest_lower = pytester.path.joinpath("TESTS/conftest.py")
+        conftest_upper_case = pytester.path.joinpath("TESTS/conftest.py")
 
         mod = config.pluginmanager._importconftest(
             conftest, importmode="prepend", rootpath=pytester.path
         )
+        assert config.pluginmanager._name2plugin[str(conftest)] is mod
 
-        # Those two calls should succeed because the conftest should be registered
-        # independently of the casing of conftestpath.
-        assert mod is config.pluginmanager._importconftest(
-            conftest, importmode="prepend", rootpath=pytester.path
+        mod_uppercase = config.pluginmanager._importconftest(
+            conftest_upper_case, importmode="prepend", rootpath=pytester.path
         )
-        assert mod is config.pluginmanager._importconftest(
-            conftest_lower, importmode="prepend", rootpath=pytester.path
+        assert (
+            config.pluginmanager._name2plugin[str(conftest_upper_case)] is mod_uppercase
         )
 
+        # No str(conftestpath) normalization so conftest should be imported
+        # twice and modules should be different objects
+        assert mod is not mod_uppercase
+
     def test_hook_tracing(self, _config_for_test: Config) -> None:
         pytestpm = _config_for_test.pluginmanager  # fully initialized with plugins
         saveindent = []
@@ -399,7 +395,7 @@ def test_consider_conftest_deps(
             pytester.makepyfile("pytest_plugins='xyz'"), root=pytester.path
         )
         with pytest.raises(ImportError):
-            pytestpm.consider_conftest(mod)
+            pytestpm.consider_conftest(mod, registration_name="unused")
 
 
 class TestPytestPluginManagerBootstrapming: