[Zope3-checkins] SVN: zope.testing/trunk/src/zope/testing/ Python 2.7 compatibility. One test is still failing, the test for a post-failure debugging thing.

[Lennart Regebro]

Log message for revision 106446:
  Python 2.7 compatibility. One test is still failing, the test for a post-failure debugging thing.
  

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

-=-
Modified: zope.testing/trunk/src/zope/testing/doctest.txt
===================================================================
--- zope.testing/trunk/src/zope/testing/doctest.txt	2009-12-13 12:57:08 UTC (rev 106445)
+++ zope.testing/trunk/src/zope/testing/doctest.txt	2009-12-13 17:49:57 UTC (rev 106446)
@@ -28,5 +28,5 @@
 
   >>> import unittest
   >>> result = unittest.TestResult()
-  >>> doctest.DocFileSuite(fn, module_relative=False).run(result)
-  <unittest.TestResult run=1 errors=0 failures=0>
+  >>> doctest.DocFileSuite(fn, module_relative=False).run(result) #doctest: +ELLIPSIS
+  <...TestResult run=1 errors=0 failures=0>

Modified: zope.testing/trunk/src/zope/testing/testrunner/tests.py
===================================================================
--- zope.testing/trunk/src/zope/testing/testrunner/tests.py	2009-12-13 12:57:08 UTC (rev 106445)
+++ zope.testing/trunk/src/zope/testing/testrunner/tests.py	2009-12-13 17:49:57 UTC (rev 106446)
@@ -72,10 +72,10 @@
 
         # omit traceback entries for unittest.py or doctest.py from
         # output:
-        (re.compile(r'^ +File "[^\n]*(doc|unit)test.py", [^\n]+\n[^\n]+\n',
+        (re.compile(r'^ +File "[^\n]*(doctest|unittest|case).py", [^\n]+\n[^\n]+\n',
                     re.MULTILINE),
          r''),
-        (re.compile(r'^{\w+} +File "{\w+}[^\n]*(doc|unit)test.py{\w+}", [^\n]+\n[^\n]+\n',
+        (re.compile(r'^{\w+} +File "{\w+}[^\n]*(doctest|unittest|case).py{\w+}", [^\n]+\n[^\n]+\n',
                     re.MULTILINE),
          r''),
         #(re.compile('^> [^\n]+->None$', re.M), '> ...->None'),
@@ -114,10 +114,10 @@
 
         # omit traceback entries for unittest.py or doctest.py from
         # output:
-        (re.compile(r'^ +File "[^\n]*(doc|unit)test.py", [^\n]+\n[^\n]+\n',
+        (re.compile(r'^ +File "[^\n]*(doctest|unittest|case).py", [^\n]+\n[^\n]+\n',
                     re.MULTILINE),
          r''),
-        (re.compile(r'^{\w+} +File "{\w+}[^\n]*(doc|unit)test.py{\w+}", [^\n]+\n[^\n]+\n',
+        (re.compile(r'^{\w+} +File "{\w+}[^\n]*(doctest|unittest|case).py{\w+}", [^\n]+\n[^\n]+\n',
                     re.MULTILINE),
          r''),
         (re.compile('import pdb; pdb'), 'Pdb()'), # Py 2.3