[Checkins] SVN: zope.testing/trunk/ fix for Windows (plus some whitespace fixes my editor threw in)

[Gary Poster]

Log message for revision 104402:
  fix for Windows (plus some whitespace fixes my editor threw in)

Changed:
  U   zope.testing/trunk/CHANGES.txt
  U   zope.testing/trunk/src/zope/testing/testrunner/runner.py

-=-
Modified: zope.testing/trunk/CHANGES.txt
===================================================================
--- zope.testing/trunk/CHANGES.txt	2009-09-21 16:43:42 UTC (rev 104401)
+++ zope.testing/trunk/CHANGES.txt	2009-09-21 16:57:20 UTC (rev 104402)
@@ -7,6 +7,9 @@
 - Avoid a split() call or we get test failures when running from a directory
   with spaces in it.
 
+- Fix testrunner behavior on Windows for -j2 (or greater) combined with -v
+  (or greater).
+
 3.8.2 (2009-09-15)
 ==================
 
@@ -17,7 +20,7 @@
 3.8.1 (2009-08-12)
 ==================
 
-- Avoid hardcoding sys.argv[0] as script; 
+- Avoid hardcoding sys.argv[0] as script;
   allow, for instance, Zope 2's `bin/instance test` (LP#407916).
 
 - Produce a clear error message when a subprocess doesn't follow the
@@ -31,7 +34,7 @@
 
 - Include incremental output when there are multiple subprocesses and a
   verbosity of -vv or greater is requested.  This again is not batched,
-  supporting automated processes and humans looking for hung tests. 
+  supporting automated processes and humans looking for hung tests.
 
 
 3.8.0 (2009-07-24)

Modified: zope.testing/trunk/src/zope/testing/testrunner/runner.py
===================================================================
--- zope.testing/trunk/src/zope/testing/testrunner/runner.py	2009-09-21 16:43:42 UTC (rev 104401)
+++ zope.testing/trunk/src/zope/testing/testrunner/runner.py	2009-09-21 16:57:20 UTC (rev 104402)
@@ -495,7 +495,7 @@
         sys.stdout.flush()
 
 
-_is_dots = re.compile(r'\.+\n').match
+_is_dots = re.compile(r'\.+(\r\n?|\n)').match # Windows sneaks in a \r\n.
 class KeepaliveSubprocessResult(AbstractSubprocessResult):
     "Keeps stdout for later processing; sends marks to queue to show activity."