Merge pull request #8022 from bluetech/doctest-init

main: fix only one doctest collected on pytest --doctest-modules __init__.py

changelog/8016.bugfix.rst

@@ -0,0 +1 @@
+Fixed only one doctest being collected when using ``pytest --doctest-modules path/to/an/__init__.py``.

src/_pytest/main.py

@@ -775,12 +775,14 @@ class Session(nodes.FSCollector):
                     self._notfound.append((report_arg, col))
                     continue
 
-                # If __init__.py was the only file requested, then the matched node will be
+                # If __init__.py was the only file requested, then the matched
-                # the corresponding Package, and the first yielded item will be the __init__
+                # node will be the corresponding Package (by default), and the
-                # Module itself, so just use that. If this special case isn't taken, then all
+                # first yielded item will be the __init__ Module itself, so
-                # the files in the package will be yielded.
+                # just use that. If this special case isn't taken, then all the
-                if argpath.basename == "__init__.py":
+                # files in the package will be yielded.
-                    assert isinstance(matching[0], nodes.Collector)
+                if argpath.basename == "__init__.py" and isinstance(
+                    matching[0], Package
+                ):
                     try:
                         yield next(iter(matching[0].collect()))
                     except StopIteration:

testing/test_doctest.py

@@ -68,9 +68,13 @@ class TestDoctests:
             assert isinstance(items[0].parent, DoctestModule)
             assert items[0].parent is items[1].parent
 
-    def test_collect_module_two_doctest_no_modulelevel(self, pytester: Pytester):
+    @pytest.mark.parametrize("filename", ["__init__", "whatever"])
+    def test_collect_module_two_doctest_no_modulelevel(
+        self, pytester: Pytester, filename: str,
+    ) -> None:
         path = pytester.makepyfile(
-            whatever="""
+            **{
+                filename: """
             '# Empty'
             def my_func():
                 ">>> magic = 42 "
@@ -84,7 +88,8 @@ class TestDoctests:
                 # This is another function
                 >>> import os # this one does have a doctest
                 '''
-        """
+            """,
+            },
         )
         for p in (path, pytester.path):
             items, reprec = pytester.inline_genitems(p, "--doctest-modules")