Give test directory a more reasonable name.

diff --git a/Lib/test/namespace_pkgs/module_and_file/a_test.py b/Lib/test/namespace_pkgs/module_and_namespace_package/a_test.py
similarity index 100%
rename from Lib/test/namespace_pkgs/module_and_file/a_test.py
rename to Lib/test/namespace_pkgs/module_and_namespace_package/a_test.py

diff --git a/Lib/test/namespace_pkgs/module_and_file/a_test/empty b/Lib/test/namespace_pkgs/module_and_namespace_package/a_test/empty
similarity index 100%
rename from Lib/test/namespace_pkgs/module_and_file/a_test/empty
rename to Lib/test/namespace_pkgs/module_and_namespace_package/a_test/empty

diff --git a/Lib/test/test_namespace_pkgs.py b/Lib/test/test_namespace_pkgs.py
index 7ad511fae7f817d05db05839bbbc58cc002ae6fd..6693d64f0be14292105464db2146adee9102ae05 100644 (file)
--- a/Lib/test/test_namespace_pkgs.py
+++ b/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')
 

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 916cb8ed504a44520bd1c05183dedb2707c80b21..bfa818bfbb91ddb700f59438498e099f01351ede 100644 (file)
--- a/Makefile.pre.in
+++ b/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 \