From fc538c5766a1c67bfcd704288279ceac5e20070a Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Mon, 29 May 2023 22:38:36 +0300
Subject: [PATCH] cacheprovider: fix file-skipping feature for files in
 packages

`--lf` has a feature where if a certain `Module` (python file) does not
contain any failed tests, it is skipped entirely at the collector level
instead of being collected and each item skipped individually. When this
happens the collection summary looks like this:

    run-last-failure: rerun previous 1 failure (skipped 1 file)

However, this feature didn't work for `Module`s inside of `Package`s,
only for those directly beneath the `Session`.

Fix #11054.
---
 changelog/11054.bugfix.rst    | 1 +
 src/_pytest/cacheprovider.py  | 2 +-
 testing/test_cacheprovider.py | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 changelog/11054.bugfix.rst

diff --git a/changelog/11054.bugfix.rst b/changelog/11054.bugfix.rst
new file mode 100644
index 000000000..a8ee04fe3
--- /dev/null
+++ 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
index 89a4a55f8..84ca2c688 100755
--- a/src/_pytest/cacheprovider.py
+++ b/src/_pytest/cacheprovider.py
@@ -219,7 +219,7 @@ class LFPluginCollWrapper:
 
     @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
index ee2fe1845..7c6606e2b 100644
--- a/testing/test_cacheprovider.py
+++ b/testing/test_cacheprovider.py
@@ -420,7 +420,13 @@ class TestLastFailed:
         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