[Zope3-checkins] SVN: zope.testing/branches/3.5/ Launchpad #242851: applied patch for package normalization

[Andreas Jung]

Log message for revision 88055:
  Launchpad #242851: applied patch for package normalization
  

Changed:
  U   zope.testing/branches/3.5/README.txt
  U   zope.testing/branches/3.5/setup.py
  U   zope.testing/branches/3.5/src/zope/testing/testrunner.py

-=-
Modified: zope.testing/branches/3.5/README.txt
===================================================================
--- zope.testing/branches/3.5/README.txt	2008-07-06 01:51:42 UTC (rev 88054)
+++ zope.testing/branches/3.5/README.txt	2008-07-06 06:34:08 UTC (rev 88055)
@@ -70,6 +70,15 @@
 
 - Added --no-progress and --auto-progress options.
 
+3.5.2 (2008/07/06)
+==================
+
+Bugs Fixed:
+-----------
+
+- Launchpad #242851: fixed package normalization
+
+
 3.5.1 (2007/08/14)
 ==================
 

Modified: zope.testing/branches/3.5/setup.py
===================================================================
--- zope.testing/branches/3.5/setup.py	2008-07-06 01:51:42 UTC (rev 88054)
+++ zope.testing/branches/3.5/setup.py	2008-07-06 06:34:08 UTC (rev 88055)
@@ -71,7 +71,7 @@
 
 setup(
     name='zope.testing',
-    version='3.5.1',
+    version='3.5.2',
     url='http://www.python.org/pypi/zope.testing',
     license='ZPL 2.1',
     description='Zope testing framework, including the testrunner script.',

Modified: zope.testing/branches/3.5/src/zope/testing/testrunner.py
===================================================================
--- zope.testing/branches/3.5/src/zope/testing/testrunner.py	2008-07-06 01:51:42 UTC (rev 88054)
+++ zope.testing/branches/3.5/src/zope/testing/testrunner.py	2008-07-06 06:34:08 UTC (rev 88055)
@@ -2501,7 +2501,12 @@
                           ])
 
     if options.package:
-        pkgmap = dict(options.test_path)
+        # DM 2008-06-25: filter out '--test-path' values as
+        #   they are not involved in package resolution
+        #pkgmap = dict(options.test_path)
+        pkgmap = dict([(path, '') for path in options.path]
+                      + (options.package_path or [])
+                      )
         options.package = [normalize_package(p, pkgmap)
                            for p in options.package]
 
@@ -2660,6 +2665,7 @@
             sys.argv[:],
             sys.modules.copy(),
             gc.get_threshold(),
+            os.getcwd(),
             )
         test.globs['this_directory'] = os.path.split(__file__)[0]
         test.globs['testrunner_script'] = __file__
@@ -2669,6 +2675,7 @@
         gc.set_threshold(*test.globs['saved-sys-info'][3])
         sys.modules.clear()
         sys.modules.update(test.globs['saved-sys-info'][2])
+        os.chdir(test.globs['saved-sys-info'][4])
 
     suites = [
         doctest.DocFileSuite(
@@ -2690,6 +2697,7 @@
         'testrunner-repeat.txt',
         'testrunner-gc.txt',
         'testrunner-knit.txt',
+        'testrunner-package-normalization.txt',
         setUp=setUp, tearDown=tearDown,
         optionflags=doctest.ELLIPSIS+doctest.NORMALIZE_WHITESPACE,
         checker=checker),