[7.3.x] cacheprovider: fix file-skipping feature for files in packages

pytest-dev · May 30, 2023 · 30a1125 · 30a1125
1 parent 682fc81
commit 30a1125
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/changelog/11054.bugfix.rst b/changelog/11054.bugfix.rst
@@ -0,0 +1 @@
+Fixed ``--last-failed``'s "(skipped N files)" functionality for files inside of packages (directories with `__init__.py` files).
diff --git a/src/_pytest/cacheprovider.py b/src/_pytest/cacheprovider.py
@@ -213,7 +213,7 @@ def __init__(self, lfplugin: "LFPlugin") -> None:
 
     @hookimpl(hookwrapper=True)
     def pytest_make_collect_report(self, collector: nodes.Collector):
-        if isinstance(collector, Session):
+        if isinstance(collector, (Session, Package)):
             out = yield
             res: CollectReport = out.get_result()
 

diff --git a/testing/test_cacheprovider.py b/testing/test_cacheprovider.py
@@ -420,7 +420,13 @@ def test_fail(val):
         result = pytester.runpytest()
         result.stdout.fnmatch_lines(["*1 failed in*"])
 
-    def test_terminal_report_lastfailed(self, pytester: Pytester) -> None:
+    @pytest.mark.parametrize("parent", ("session", "package"))
+    def test_terminal_report_lastfailed(self, pytester: Pytester, parent: str) -> None:
+        if parent == "package":
+            pytester.makepyfile(
+                __init__="",
+            )
+
         test_a = pytester.makepyfile(
             test_a="""
             def test_a1(): pass
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed ``--last-failed``'s "(skipped N files)" functionality for files inside of packages (directories with `__init__.py` files).