Different fix for conftest loading

Author: bluetech

src/_pytest/main.py

@@ -12,7 +12,6 @@
 from typing import Dict
 from typing import final
 from typing import FrozenSet
-from typing import Generator
 from typing import Iterable
 from typing import Iterator
 from typing import List
@@ -501,11 +500,11 @@ def collect(self) -> Iterable[Union[nodes.Item, nodes.Collector]]:
         config = self.config
         col: Optional[nodes.Collector]
         cols: Sequence[nodes.Collector]
+        ihook = self.ihook
         for direntry in scandir(self.path):
             if direntry.is_dir():
                 if direntry.name == "__pycache__":
                     continue
-                ihook = self.ihook
                 path = Path(direntry.path)
                 if not self.session.isinitpath(path, with_parents=True):
                     if ihook.pytest_ignore_collect(collection_path=path, config=config):
@@ -515,7 +514,6 @@ def collect(self) -> Iterable[Union[nodes.Item, nodes.Collector]]:
                     yield col
 
             elif direntry.is_file():
-                ihook = self.ihook
                 path = Path(direntry.path)
                 if not self.session.isinitpath(path):
                     if ihook.pytest_ignore_collect(collection_path=path, config=config):
@@ -558,7 +556,6 @@ def __init__(self, config: Config) -> None:
         self._initialpaths_with_parents: FrozenSet[Path] = frozenset()
         self._notfound: List[Tuple[str, Sequence[nodes.Collector]]] = []
         self._initial_parts: List[Tuple[Path, List[str]]] = []
-        self._in_genitems = False
         self._collection_cache: Dict[nodes.Collector, CollectReport] = {}
         self.items: List[nodes.Item] = []
 
@@ -611,29 +608,6 @@ def pytest_runtest_logreport(
 
     pytest_collectreport = pytest_runtest_logreport
 
-    @hookimpl(wrapper=True)
-    def pytest_collect_directory(
-        self,
-    ) -> Generator[None, Optional[nodes.Collector], Optional[nodes.Collector]]:
-        col = yield
-
-        # Eagerly load conftests for the directory.
-        # This is needed because a conftest error needs to happen while
-        # collecting a collector, so it is caught by its CollectReport.
-        # Without this, the conftests are loaded inside of genitems itself
-        # which leads to an internal error.
-        # This should only be done for genitems; if done unconditionally, it
-        # will load conftests for non-selected directories which is to be
-        # avoided.
-        if self._in_genitems and col is not None:
-            self.config.pluginmanager._loadconftestmodules(
-                col.path,
-                self.config.getoption("importmode"),
-                rootpath=self.config.rootpath,
-            )
-
-        return col
-
     def isinitpath(
         self,
         path: Union[str, "os.PathLike[str]"],
@@ -664,15 +638,6 @@ def gethookproxy(self, fspath: "os.PathLike[str]") -> pluggy.HookRelay:
         pm = self.config.pluginmanager
         # Check if we have the common case of running
         # hooks with all conftest.py files.
-        #
-        # TODO: pytest relies on this call to load non-initial conftests. This
-        # is incidental. It will be better to load conftests at a more
-        # well-defined place.
-        pm._loadconftestmodules(
-            path,
-            self.config.getoption("importmode"),
-            rootpath=self.config.rootpath,
-        )
         my_conftestmodules = pm._getconftestmodules(path)
         remove_mods = pm._conftest_plugins.difference(my_conftestmodules)
         proxy: pluggy.HookRelay
@@ -753,7 +718,6 @@ def perform_collect(  # noqa: F811
 
         self._notfound = []
         self._initial_parts = []
-        self._in_genitems = False
         self._collection_cache = {}
         self.items = []
         items: Sequence[Union[nodes.Item, nodes.Collector]] = self.items
@@ -788,7 +752,6 @@ def perform_collect(  # noqa: F811
 
                 raise UsageError(*errors)
 
-            self._in_genitems = True
             if not genitems:
                 items = rep.result
             else:
@@ -803,7 +766,6 @@ def perform_collect(  # noqa: F811
         finally:
             self._notfound = []
             self._initial_parts = []
-            self._in_genitems = False
             self._collection_cache = {}
             hook.pytest_collection_finish(session=self)
 

src/_pytest/python.py

@@ -719,12 +719,12 @@ def sort_key(entry: "os.DirEntry[str]") -> object:
         config = self.config
         col: Optional[nodes.Collector]
         cols: Sequence[nodes.Collector]
+        ihook = self.ihook
         for direntry in scandir(self.path, sort_key):
             if direntry.is_dir():
                 if direntry.name == "__pycache__":
                     continue
                 path = Path(direntry.path)
-                ihook = self.ihook
                 if not self.session.isinitpath(path, with_parents=True):
                     if ihook.pytest_ignore_collect(collection_path=path, config=config):
                         continue
@@ -734,7 +734,6 @@ def sort_key(entry: "os.DirEntry[str]") -> object:
 
             elif direntry.is_file():
                 path = Path(direntry.path)
-                ihook = self.ihook
                 if not self.session.isinitpath(path):
                     if ihook.pytest_ignore_collect(collection_path=path, config=config):
                         continue

src/_pytest/runner.py

@@ -28,6 +28,7 @@
 from _pytest.config.argparsing import Parser
 from _pytest.deprecated import check_ispytest
 from _pytest.nodes import Collector
+from _pytest.nodes import Directory
 from _pytest.nodes import Item
 from _pytest.nodes import Node
 from _pytest.outcomes import Exit
@@ -368,7 +369,23 @@ def pytest_runtest_makereport(item: Item, call: CallInfo[None]) -> TestReport:
 
 
 def pytest_make_collect_report(collector: Collector) -> CollectReport:
-    call = CallInfo.from_call(lambda: list(collector.collect()), "collect")
+    def collect() -> List[Union[Item, Collector]]:
+        # Before collecting, if this is a Directory, load the conftests.
+        # If a conftest import fails to load, it is considered a collection
+        # error of the Directory collector. This is why it's done inside of the
+        # CallInfo wrapper.
+        #
+        # Note: initial conftests are loaded early, not here.
+        if isinstance(collector, Directory):
+            collector.config.pluginmanager._loadconftestmodules(
+                collector.path,
+                collector.config.getoption("importmode"),
+                rootpath=collector.config.rootpath,
+            )
+
+        return list(collector.collect())
+
+    call = CallInfo.from_call(collect, "collect")
     longrepr: Union[None, Tuple[str, int, str], str, TerminalRepr] = None
     if not call.excinfo:
         outcome: Literal["passed", "skipped", "failed"] = "passed"