[Python-checkins] cpython: Give test directory a more reasonable name.

eric.smith python-checkins at python.org
Mon Jun 25 01:55:30 CEST 2012


http://hg.python.org/cpython/rev/2a24d3bd16a9
changeset:   77759:2a24d3bd16a9
user:        Eric V. Smith <eric at trueblade.com>
date:        Sun Jun 24 19:55:18 2012 -0400
summary:
  Give test directory a more reasonable name.

files:
  Lib/test/namespace_pkgs/module_and_file/a_test.py    |  0 
  Lib/test/namespace_pkgs/module_and_file/a_test/empty |  0 
  Lib/test/test_namespace_pkgs.py                      |  6 ++++--
  Makefile.pre.in                                      |  4 ++--
  4 files changed, 6 insertions(+), 4 deletions(-)


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
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
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
--- a/Lib/test/test_namespace_pkgs.py
+++ b/Lib/test/test_namespace_pkgs.py
@@ -276,10 +276,12 @@
         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
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -991,8 +991,8 @@
 		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 \

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list