update tests to have more consistent names and acutally be namespace packages

Author: chrisphilip322

mypy/build.py

@@ -899,12 +899,16 @@ def _find_module_non_stub_helper(
         self,
         components: List[str],
         pkg_dir: str
-    ) -> Optional[str]:
+    ) -> Optional[Tuple[str, bool]]:
         fscache = self.fscache
-        for count in range(len(components)):
-            typed_file = os.path.join(pkg_dir, *components[:count + 1], 'py.typed')
-            if fscache.isfile(typed_file):
-                return os.path.join(pkg_dir, *components[:-1])
+        pkgs2check = (
+            fscache.isfile(os.path.join(pkg_dir, *components[:count + 1], 'py.typed'))
+            for count in range(len(components))
+        )
+        if next(pkgs2check):
+            return os.path.join(pkg_dir, *components[:-1]), True
+        if any(pkgs2check):
+            return os.path.join(pkg_dir, *components[:-1]), False
         return None
 
     def _find_module(self, id: str, search_paths: SearchPaths,
@@ -950,7 +954,7 @@ def _find_module(self, id: str, search_paths: SearchPaths,
                 pkg_dir
             )
             if non_stub_match:
-                third_party_inline_dirs.append((non_stub_match, True))
+                third_party_inline_dirs.append(non_stub_match)
         if self.options and self.options.use_builtins_fixtures:
             # Everything should be in fixtures.
             third_party_inline_dirs.clear()

mypy/test/testpep561.py

@@ -22,14 +22,14 @@
 """
 
 NAMESPACE_PROGRAM = """
-from macbeth_nested.nested_package.nested_module import nested_func
-from macbeth_namespace.inside_namespace_package.namespace_module import namespace_func
+from typedpkg_nested.nested_package.nested_module import nested_func
+from typedpkg_namespace.alpha.alpha_module import alpha_func
 
 nested_func("abc")
-namespace_func(False)
+alpha_func(False)
 
 nested_func(False)
-namespace_func(2)
+alpha_func(2)
 """
 
 
@@ -260,7 +260,7 @@ def setUp(self) -> None:
             'expected "str"\n'.format(self.tempfile)
         )
         self.msg_int_bool = (
-            '{0}:9: error: Argument 1 to "namespace_func" has incompatible type "int"; '
+            '{0}:9: error: Argument 1 to "alpha_func" has incompatible type "int"; '
             'expected "bool"\n'.format(self.tempfile)
         )
 
@@ -270,8 +270,8 @@ def tearDown(self) -> None:
     def test_nested_and_namespace(self) -> None:
         with self.virtualenv() as venv:
             venv_dir, python_executable = venv
-            self.install_package('macbeth_nested', python_executable)
-            self.install_package('macbeth_namespace', python_executable)
+            self.install_package('typedpkg_nested', python_executable)
+            self.install_package('typedpkg_namespace.alpha', python_executable)
             check_mypy_run(
                 [self.tempfile],
                 python_executable,

test-data/packages/macbeth_namespace/macbeth_namespace/inside_namespace_package/namespace_module.py

@@ -0,0 +1,10 @@
+from setuptools import setup, find_packages
+
+setup(
+    name='typedpkg_namespace.alpha',
+    version='1.0.0',
+    packages=find_packages(),
+    namespace_packages=['typedpkg_namespace'],
+    zip_safe=False,
+    package_data={'typedpkg_namespace.alpha': ['py.typed']}
+)

test-data/packages/macbeth_namespace/setup.py

@@ -0,0 +1,2 @@
+def alpha_func(a: bool) -> bool:
+    return not a

test-data/packages/typedpkg_namespace.alpha/setup.py

@@ -1,9 +1,9 @@
 from setuptools import setup, find_packages
 
 setup(
-    name='macbeth_nested',
+    name='typedpkg_nested',
     version='1.0.0',
     packages=find_packages(),
     zip_safe=False,
-    package_data={'macbeth_nested.nested_package': ['py.typed']}
+    package_data={'typedpkg_nested.nested_package': ['py.typed']}
 )