[Checkins] SVN: zope.testrunner/trunk/src/zope/testrunner/test Fix Windows test failures in testrunner-progress.txt.

[Marius Gedminas]

Log message for revision 117533:
  Fix Windows test failures in testrunner-progress.txt.
  
  The code stripped all the \r's from the actual output, and then inserted
  some \r's into expected output, naturally causing a failure.  There were
  two approaches: strip \r's from both, or not strip \r's at all.  I've chosen
  not to strip them, since testrunner-progress.txt cares about that.
  
  The other failure was caused by over-eager windows\path\separator fixes to
  unixlike/path/names that accidentally caught some string literals containing
  '\r' in them.
  
  

Changed:
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-progress.txt
  U   zope.testrunner/trunk/src/zope/testrunner/tests.py

-=-
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-progress.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-progress.txt	2010-10-13 23:41:30 UTC (rev 117532)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-progress.txt	2010-10-13 23:44:41 UTC (rev 117533)
@@ -73,7 +73,6 @@
                      ##r##
         26/26 (100.0%)##r##
                       ##r##
-    <BLANKLINE>
       Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in N.NNN seconds.
@@ -149,7 +148,6 @@
                                                    ##r##
      testrunner-ex/sampletests/../sampletestsl.txt##r##
                                                                                    ##r##
-    <BLANKLINE>
       Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in N.NNN seconds.
@@ -229,7 +227,6 @@
                                                    ##r##
         26/26 (100.0%) ... r-ex/sampletests/../sampletestsl.txt##r##
                                                                ##r##
-    <BLANKLINE>
       Ran 26 tests with 0 failures and 0 errors in N.NNN seconds.
     Tearing down left over layers:
       Tear down samplelayers.Layer122 in N.NNN seconds.

Modified: zope.testrunner/trunk/src/zope/testrunner/tests.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/tests.py	2010-10-13 23:41:30 UTC (rev 117532)
+++ zope.testrunner/trunk/src/zope/testrunner/tests.py	2010-10-13 23:44:41 UTC (rev 117533)
@@ -44,10 +44,6 @@
         (re.compile(r"<type 'exceptions.(\w+)Error'>:"),
                     r'exceptions.\1Error:'),
 
-        # Remove '\r', since this only causes confusion.
-        (re.compile(r'\\r', re.MULTILINE), ''),
-        (re.compile(r'\r', re.MULTILINE), ''),
-
         # testtools content formatter is used to mime-encode
         # tracebacks when the SubunitOutputFormatter is used, and the
         # resulting text includes a size which can vary depending on
@@ -64,6 +60,8 @@
         (re.compile(r'\\'), '/'), # even more Windows happiness
                                   # replaces backslashes in paths
 
+        (re.compile(r'/r$', re.MULTILINE), '\\r'), # undo some of that
+
         #this is a magic to put linefeeds into the doctest
         (re.compile('##r##\n'), '\r'),