[Zope3-checkins] SVN: zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/test passes again on win

[Adam Groszer]

Log message for revision 100711:
  passes again on win

Changed:
  U   zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-errors.txt
  U   zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-progress.txt
  U   zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/tests.py

-=-
Modified: zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-errors.txt
===================================================================
--- zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-errors.txt	2009-06-07 16:12:45 UTC (rev 100710)
+++ zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-errors.txt	2009-06-07 16:12:57 UTC (rev 100711)
@@ -354,7 +354,6 @@
                      ##r##
         56/56 (100.0%)##r##
                       ##r##
-    <BLANKLINE>
       Ran 56 tests with 3 failures and 1 errors in 0.054 seconds.
     Tearing down left over layers:
       Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.

Modified: zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-progress.txt
===================================================================
--- zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-progress.txt	2009-06-07 16:12:45 UTC (rev 100710)
+++ zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/testrunner-progress.txt	2009-06-07 16:12:57 UTC (rev 100711)
@@ -73,7 +73,6 @@
                      ##r##
         34/34 (100.0%)##r##
                       ##r##
-    <BLANKLINE>
       Ran 34 tests with 0 failures and 0 errors in 0.008 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.
@@ -148,7 +147,6 @@
                                                ##r##
     34/34 (100.0%) ... pe/testing/testrunner-ex/sampletests/../sampletestsl.txt##r##
                                                                                ##r##
-<BLANKLINE>
   Ran 34 tests with 0 failures and 0 errors in 0.008 seconds.
 Tearing down left over layers:
   Tear down samplelayers.Layer122 in 0.000 seconds.
@@ -225,7 +223,6 @@
                                                    ##r##
         34/34 (100.0%) ... r-ex/sampletests/../sampletestsl.txt##r##
                                                                ##r##
-    <BLANKLINE>
       Ran 34 tests with 0 failures and 0 errors in 0.008 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.
@@ -294,7 +291,6 @@
                                                   ##r##
         24/24 (100.0%) test_z1 (sampletests.test122)##r##
                                                    ##r##
-    <BLANKLINE>
       Ran 24 tests with 0 failures and 0 errors in 0.006 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.
@@ -349,7 +345,6 @@
                                                               ##r##
         18/18 (100.0%) test_z1 (sampletests.test122) (0.001 s)##r##
                                                                ##r##
-    <BLANKLINE>
       Ran 18 tests with 0 failures and 0 errors in 0.006 seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in 0.000 seconds.
@@ -399,7 +394,6 @@
                    ##r##
         6/6 (100.0%)##r##
                     ##r##
-    <BLANKLINE>
       Ran 6 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.

Modified: zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/tests.py
===================================================================
--- zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/tests.py	2009-06-07 16:12:45 UTC (rev 100710)
+++ zope.testing/branches/adamg-renormalizefix/src/zope/testing/testrunner/tests.py	2009-06-07 16:12:57 UTC (rev 100711)
@@ -55,12 +55,15 @@
         (re.compile(r'\\'), '/'), # even more Windows happiness
                                   # replaces backslashes in paths
 
-        (re.compile('/r'), '\\\\r'), # undo damage from previous
+        #(re.compile('/r'), '\\r'), # undo damage from previous
 
         #(re.compile(r'\\r'), '\\\\r\n'),
-        (re.compile('##r##'), '\r'), #this is a magic to put linefeeds into the
+        #(re.compile('##r##'), r'\r'), #this is a magic to put linefeeds into the
                                      #doctest
+        #(re.compile(r'\r'), '\\\\r\n'),
 
+        (re.compile('##r##\n'), '\r'),
+
         #(re.compile(r'/r'), ' '),
 
         (re.compile(r'\d+[.]\d\d\d seconds'), 'N.NNN seconds'),