reproduce python#18997

Author: jorenham

mypy/test/testmodulefinder.py

@@ -195,6 +195,8 @@ def test__packages_with_ns(self) -> None:
             ("pkg_typed.b", self.path("pkg_typed", "b", "__init__.py")),
             ("pkg_typed.b.c", self.path("pkg_typed", "b", "c.py")),
             ("pkg_typed.a.a_var", ModuleNotFoundReason.NOT_FOUND),
+            # Regular package with py.typed, bundled stubs, and external stubs-only package
+            ("pkg_typed_w_stubs", self.path("pkg_typed_w_stubs-stubs", "__init__.pyi")),
             # Regular package without py.typed
             ("pkg_untyped", ModuleNotFoundReason.FOUND_WITHOUT_TYPE_HINTS),
             ("pkg_untyped.a", ModuleNotFoundReason.FOUND_WITHOUT_TYPE_HINTS),
@@ -250,6 +252,8 @@ def test__packages_without_ns(self) -> None:
             ("pkg_typed.b", self.path("pkg_typed", "b", "__init__.py")),
             ("pkg_typed.b.c", self.path("pkg_typed", "b", "c.py")),
             ("pkg_typed.a.a_var", ModuleNotFoundReason.NOT_FOUND),
+            # Regular package with py.typed, bundled stubs, and external stubs-only package
+            ("pkg_typed_w_stubs", self.path("pkg_typed_w_stubs-stubs", "__init__.pyi")),
             # Regular package without py.typed
             ("pkg_untyped", ModuleNotFoundReason.FOUND_WITHOUT_TYPE_HINTS),
             ("pkg_untyped.a", ModuleNotFoundReason.FOUND_WITHOUT_TYPE_HINTS),

test-data/packages/modulefinder-site-packages/foo-stubs/qux.pyi

@@ -0,0 +1 @@
+qux_var: int

test-data/packages/modulefinder-site-packages/pkg_typed_w_stubs-stubs/__init__.pyi

@@ -0,0 +1 @@
+pkg_typed_w_stubs_var: str = ...

test-data/packages/modulefinder-site-packages/pkg_typed_w_stubs/__init__.py

@@ -0,0 +1 @@
+pkg_typed_w_stubs_var = "pkg_typed_w_stubs"

test-data/packages/modulefinder-site-packages/pkg_typed_w_stubs/__init__.pyi

@@ -0,0 +1 @@
+pkg_typed_w_stubs_var: object