Go back to fixed code

Author: lesteve

src/_pytest/config/__init__.py

@@ -636,8 +636,8 @@ def _importconftest(
     ) -> 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(str(conftestpath))
+        normalized_conftestpath = os.path.normcase(conftestpath)
+        existing = self.get_plugin(normalized_conftestpath)
         if existing is not None:
             return cast(types.ModuleType, existing)
 
@@ -747,8 +747,8 @@ def consider_conftest(self, conftestmodule: types.ModuleType) -> None:
         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=name)
+        normalized_name = name if name is None else os.path.normcase(name)
+        self.register(conftestmodule, name=normalized_name)
 
     def consider_env(self) -> None:
         """:meta private:"""

testing/test_conftest.py

@@ -212,8 +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())
+    key = os.path.normcase(subconftest.resolve())
     if name not in ("whatever", ".dotdir"):
         assert pm.has_plugin(key)
         assert len(set(pm.get_plugins()) - {pm}) == 1