[Checkins] SVN: zope.testing/trunk/ make tests pass in Py 2.5. one test still fails in 2.4. add doctest fork tests to test suite.

[Gary Poster]

Log message for revision 96603:
  make tests pass in Py 2.5.  one test still fails in 2.4.  add doctest fork tests to test suite.

Changed:
  U   zope.testing/trunk/buildout.cfg
  U   zope.testing/trunk/src/zope/testing/doctest.txt
  U   zope.testing/trunk/src/zope/testing/tests.py

-=-
Modified: zope.testing/trunk/buildout.cfg
===================================================================
--- zope.testing/trunk/buildout.cfg	2009-02-16 19:29:33 UTC (rev 96602)
+++ zope.testing/trunk/buildout.cfg	2009-02-16 19:56:41 UTC (rev 96603)
@@ -2,8 +2,6 @@
 develop = .
 parts = test
 
-find-links = http://download.zope.org/distribution/
-
 [test]
 recipe = zc.recipe.testrunner
 eggs = zope.testing

Modified: zope.testing/trunk/src/zope/testing/doctest.txt
===================================================================
--- zope.testing/trunk/src/zope/testing/doctest.txt	2009-02-16 19:29:33 UTC (rev 96602)
+++ zope.testing/trunk/src/zope/testing/doctest.txt	2009-02-16 19:56:41 UTC (rev 96603)
@@ -4,7 +4,7 @@
 
 Most `doctest` module tests are located within the module. This file only
 tests a few additional features not covered by the module tests, so that the
-changes to the `doctest` module -- which is forked from the Python stanadrd
+changes to the `doctest` module -- which is forked from the Python standard
 library -- are minimized.
 
 Working with Carriage Returns
@@ -12,7 +12,7 @@
 
 Due to the way releases are made on different platforms, we sometimes test
 files on a *nix system with Windows file endings. Unfortunately, that leaves
-some the tests broken:
+some of the test files broken:
 
   >>> import tempfile
   >>> fn = tempfile.mktemp()

Modified: zope.testing/trunk/src/zope/testing/tests.py
===================================================================
--- zope.testing/trunk/src/zope/testing/tests.py	2009-02-16 19:29:33 UTC (rev 96602)
+++ zope.testing/trunk/src/zope/testing/tests.py	2009-02-16 19:56:41 UTC (rev 96603)
@@ -17,9 +17,10 @@
 """
 
 import os
+import re
 import sys
 import unittest
-from zope.testing import doctest, testrunner
+from zope.testing import doctest, testrunner, renormalizing
 
 def test_suite():
     return unittest.TestSuite((
@@ -28,6 +29,15 @@
         doctest.DocTestSuite('zope.testing.server'),
         doctest.DocFileSuite('doctest.txt'),
         doctest.DocFileSuite('formparser.txt'),
-        doctest.DocFileSuite('module.txt'),
+        doctest.DocFileSuite(
+            'module.txt',
+            # when this test is run in isolation, the error message shows the
+            # module name as fully qualified; when it is run as part of the
+            # full test suite, the error message shows the module name as
+            # relative.
+            checker=renormalizing.RENormalizing([
+                (re.compile('No module named zope.testing.unlikelymodulename'),
+                 'No module named unlikelymodulename')])),
         doctest.DocFileSuite('setupstack.txt'),
+        doctest.DocTestSuite(doctest, optionflags=doctest.INTERPRET_FOOTNOTES),
         ))