[Checkins] SVN: zc.recipe.testrunner/trunk/ Removed zope.testing.doctest and updated tests to last versions of all modules.

Lennart Regebro regebro at gmail.com
Thu Apr 29 07:50:53 EDT 2010


Log message for revision 111573:
  Removed zope.testing.doctest and updated tests to last versions of all modules.
  

Changed:
  U   zc.recipe.testrunner/trunk/CHANGES.txt
  U   zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/README.txt
  U   zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/bugfixes.txt
  U   zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/tests.py

-=-
Modified: zc.recipe.testrunner/trunk/CHANGES.txt
===================================================================
--- zc.recipe.testrunner/trunk/CHANGES.txt	2010-04-29 11:01:09 UTC (rev 111572)
+++ zc.recipe.testrunner/trunk/CHANGES.txt	2010-04-29 11:50:53 UTC (rev 111573)
@@ -2,6 +2,15 @@
 Change History
 **************
 
+x.y.z (Unreleased)
+==================
+
+- Updated tests to run with the last versions of all modules.
+
+- Removed the usage of the deprecated zope.testing.doctest, therby also
+  dropping Python 2.3 support.
+  
+
 1.2.0 (2009-03-23)
 ==================
 

Modified: zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/README.txt
===================================================================
--- zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/README.txt	2010-04-29 11:01:09 UTC (rev 111572)
+++ zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/README.txt	2010-04-29 11:50:53 UTC (rev 111573)
@@ -243,6 +243,7 @@
       '/sample-buildout/demo',
       '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
       '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
+      '/sample-buildout/eggs/zope.exceptions-3.5.2-py2.4.egg',
       '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
       '/usr/local/zope/lib/python',
       ]
@@ -286,6 +287,7 @@
       '/sample-buildout/demo',
       '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
       '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
+      '/sample-buildout/eggs/zope.exceptions-3.5.2-py2.4.egg',
       '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
       '/usr/local/zope/lib/python',
       ]
@@ -341,6 +343,7 @@
       '/sample-buildout/demo',
       '/sample-buildout/eggs/zope.testing-3.0-py2.4.egg',
       '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
+      '/sample-buildout/eggs/zope.exceptions-3.5.2-py2.4.egg',
       '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
       '/usr/local/zope/lib/python',
       ]
@@ -395,7 +398,6 @@
     Failure in test test (demo.tests.DemoTests)
     Traceback (most recent call last):
       ...
-        raise self.failureException, \
     AssertionError: '42' != '23'
     <BLANKLINE>
     <BLANKLINE>
@@ -439,6 +441,7 @@
       '/sample-buildout/demo',
       '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
       '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
+      '/sample-buildout/eggs/zope.exceptions-3.5.2-py2.4.egg',
       '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
       ]
     <BLANKLINE>
@@ -495,6 +498,7 @@
       '/sample-buildout/demo',
       '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
       '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
+      '/sample-buildout/eggs/zope.exceptions-3.5.2-py2.4.egg',
       '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
       '/usr/local/zope/lib/python',
       ]
@@ -543,6 +547,7 @@
       '/sample-buildout/demo',
       '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
       '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
+      '/sample-buildout/eggs/zope.exceptions-3.5.2-py2.4.egg',
       '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
       '/usr/local/zope/lib/python',
       ]
@@ -588,7 +593,7 @@
     import os
     <BLANKLINE>
     join = os.path.join
-    base = os.path.dirname(__file__)
+    base = os.path.dirname(os.path.abspath(os.path.realpath(__file__)))
     base = os.path.dirname(base)
     <BLANKLINE>
     import sys
@@ -596,6 +601,7 @@
       join(base, 'demo'),
       join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),
       join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),
+      join(base, 'eggs/zope.exceptions-3.5.2-linux-i686.egg'),
       join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),
       '/usr/local/zope/lib/python',
       join(base, 'sources'),
@@ -638,7 +644,7 @@
     import os
     <BLANKLINE>
     join = os.path.join
-    base = os.path.dirname(__file__)
+    base = os.path.dirname(os.path.abspath(os.path.realpath(__file__)))
     base = os.path.dirname(base)
     <BLANKLINE>
     import sys
@@ -646,6 +652,7 @@
       join(base, 'demo'),
       join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),
       join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),
+      join(base, 'eggs/zope.exceptions-3.5.2-linux-i686.egg'),
       join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),
       '/usr/local/zope/lib/python',
       join(base, 'sources'),

Modified: zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/bugfixes.txt
===================================================================
--- zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/bugfixes.txt	2010-04-29 11:01:09 UTC (rev 111572)
+++ zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/bugfixes.txt	2010-04-29 11:50:53 UTC (rev 111573)
@@ -85,6 +85,8 @@
   Running:
  test (bugfix1.tests.TestDemo1)
   Ran 1 tests with 0 failures and 0 errors in 0.000 seconds.
+[Parallel tests running in bugfix1.tests.Layer2:
+  . LAYER FINISHED]
 Running bugfix1.tests.Layer2 tests:
   Running in a subprocess.
   Set up bugfix1.tests.Layer2 in 0.000 seconds.

Modified: zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/tests.py
===================================================================
--- zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/tests.py	2010-04-29 11:01:09 UTC (rev 111572)
+++ zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/tests.py	2010-04-29 11:50:53 UTC (rev 111573)
@@ -17,7 +17,7 @@
 import unittest
 
 import zc.buildout.testing
-import zope.testing.doctest
+import doctest
 import zope.testing.renormalizing
 
 
@@ -27,10 +27,11 @@
     zc.buildout.testing.install_develop('zc.recipe.egg', test)
     zc.buildout.testing.install('zope.testing', test)
     zc.buildout.testing.install('zope.interface', test)
+    zc.buildout.testing.install('zope.exceptions', test)
 
 def test_suite():
     return unittest.TestSuite((
-        zope.testing.doctest.DocFileSuite(
+        doctest.DocFileSuite(
             'README.txt',
             'bugfixes.txt',
             setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
@@ -42,7 +43,9 @@
                      (re.compile('\d[.]\d+ seconds'), '0.001 seconds'),
                      (re.compile('zope.testing-[^-]+-'), 'zope.testing-X-'),
                      (re.compile('setuptools-[^-]+-'), 'setuptools-X-'),
+                     (re.compile('distribute-[^-]+-'), 'setuptools-X-'),
                      (re.compile('zope.interface-[^-]+-'), 'zope.interface-X-'),
+                     (re.compile('zope.exceptions-[^-]+-.*\.egg'), 'zope.exceptions-X-pyN.N.egg'),
                      ]),
             ),
         ))



More information about the checkins mailing list