Blob Blame History Raw
--- src/zope/testrunner/tests/test_doctest.py.orig	2016-06-20 19:00:52.000000000 -0600
+++ src/zope/testrunner/tests/test_doctest.py	2016-06-21 20:19:17.510671017 -0600
@@ -66,7 +66,7 @@ if sys.platform == 'win32':
         #this is a magic to put linefeeds into the doctest
         (re.compile('##r##\n'), '\r'),
 
-        (re.compile(r'\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
+        (re.compile(r'(\d+ minutes )?\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
         (re.compile(r'\d+[.]\d\d\d s'), 'N.NNN s'),
         (re.compile(r'\d+[.]\d\d\d{'), 'N.NNN{'),
         (re.compile(r'\d{4}-\d\d-\d\d \d\d:\d\d:\d\d\.\d+'),
@@ -125,7 +125,7 @@ else:
         (re.compile('##r##'), r'\r'),
         (re.compile(r'\r'), '\\\\r\n'),
 
-        (re.compile(r'\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
+        (re.compile(r'(\d+ minutes )?\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
         (re.compile(r'\d+[.]\d\d\d s'), 'N.NNN s'),
         (re.compile(r'\d+[.]\d\d\d{'), 'N.NNN{'),
         (re.compile(r'\d{4}-\d\d-\d\d \d\d:\d\d:\d\d\.\d+'),
@@ -322,7 +322,7 @@ def test_suite():
             setUp=setUp, tearDown=tearDown,
             optionflags=doctest.ELLIPSIS+doctest.NORMALIZE_WHITESPACE,
             checker = renormalizing.RENormalizing([
-              (re.compile(r'\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
+              (re.compile(r'(\d+ minutes )?\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
               (re.compile(r'sys refcount=\d+ +change=\d+'),
                'sys refcount=NNNNNN change=NN'),
               (re.compile(r'sum detail refcount=\d+ +'),