Give test directory a more reasonable name.

Lib/test/test_namespace_pkgs.py

@@ -276,10 +276,12 @@ class ZipWithMissingDirectory(NamespacePackageTest):
         self.assertEqual(bar.two.attr, 'missing_directory foo two')
 
 
-class ModuleAndFileInSameDir(NamespacePackageTest):
-    paths = ['module_and_file']
+class ModuleAndNamespacePackageInSameDir(NamespacePackageTest):
+    paths = ['module_and_namespace_package']
 
     def test_module_before_namespace_package(self):
+        # Make sure we find the module in preference to the
+        #  namespace package.
         import a_test
         self.assertEqual(a_test.attr, 'in module')
 

Makefile.pre.in

@@ -991,8 +991,8 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
 		test/namespace_pkgs/project3 \
 		test/namespace_pkgs/project3/parent \
 		test/namespace_pkgs/project3/parent/child \
-                test/namespace_pkgs/module_and_file \
-                test/namespace_pkgs/module_and_file/a_test \
+                test/namespace_pkgs/module_and_namespace_package \
+                test/namespace_pkgs/module_and_namespace_package/a_test \
 		collections concurrent concurrent/futures encodings \
 		email email/mime test/test_email test/test_email/data \
 		html json test/json_tests http dbm xmlrpc \