[Checkins] SVN: zope.testing/trunk/src/zope/testing/testrunner/ make layer-buff tests more robust (plus some whitespace)

[Gary Poster]

Log message for revision 104385:
  make layer-buff tests more robust (plus some whitespace)

Changed:
  U   zope.testing/trunk/src/zope/testing/testrunner/formatter.py
  U   zope.testing/trunk/src/zope/testing/testrunner/runner.py
  U   zope.testing/trunk/src/zope/testing/testrunner/testrunner-layers-buff.txt

-=-
Modified: zope.testing/trunk/src/zope/testing/testrunner/formatter.py
===================================================================
--- zope.testing/trunk/src/zope/testing/testrunner/formatter.py	2009-09-21 14:03:15 UTC (rev 104384)
+++ zope.testing/trunk/src/zope/testing/testrunner/formatter.py	2009-09-21 14:30:46 UTC (rev 104385)
@@ -266,7 +266,7 @@
 
         elif self.verbose == 1:
             sys.stdout.write('.' * test.countTestCases())
-        
+
         elif self.in_subprocess:
             sys.stdout.write('.' * test.countTestCases())
             # Give the parent process a new line so it sees the progress

Modified: zope.testing/trunk/src/zope/testing/testrunner/runner.py
===================================================================
--- zope.testing/trunk/src/zope/testing/testrunner/runner.py	2009-09-21 14:03:15 UTC (rev 104384)
+++ zope.testing/trunk/src/zope/testing/testrunner/runner.py	2009-09-21 14:30:46 UTC (rev 104385)
@@ -480,7 +480,7 @@
 
 class DeferredSubprocessResult(AbstractSubprocessResult):
     """Keeps stdout around for later processing,"""
-    
+
     def write(self, out):
         if not _is_dots(out):
             self.stdout.append(out)
@@ -505,7 +505,7 @@
         self._done = value
         assert value, 'Internal error: unexpectedly setting done to False'
         self.queue.put((self.layer_name, ' LAYER FINISHED'))
-    done = property(lambda self: self._done, _set_done) 
+    done = property(lambda self: self._done, _set_done)
 
     def write(self, out):
         if _is_dots(out):

Modified: zope.testing/trunk/src/zope/testing/testrunner/testrunner-layers-buff.txt
===================================================================
--- zope.testing/trunk/src/zope/testing/testrunner/testrunner-layers-buff.txt	2009-09-21 14:03:15 UTC (rev 104384)
+++ zope.testing/trunk/src/zope/testing/testrunner/testrunner-layers-buff.txt	2009-09-21 14:30:46 UTC (rev 104385)
@@ -68,13 +68,13 @@
     >>> pause = datetime.timedelta(seconds=0.3)
     >>> last_line, last_time = record.pop(0)
     >>> for line, time in record:
-    ...     if (time-last_time >= pause and
-    ...         line != '  Running in a subprocess.\n'):
+    ...     if time-last_time >= pause:
     ...         # We paused!
     ...         print 'PAUSE FOUND BETWEEN THESE LINES:'
     ...         print ''.join([last_line, line, '-'*70])
     ...     last_line, last_time = line, time
-    PAUSE FOUND BETWEEN THESE LINES:
+    ... # doctest: +ELLIPSIS
+    PAUSE FOUND BETWEEN THESE LINES:...
       Running:
      test_something (sampletests_buffering.TestSomething2)
     ----------------------------------------------------------------------
@@ -126,13 +126,13 @@
 
     >>> last_line, last_time = record.pop(0)
     >>> for line, time in record:
-    ...     if (time-last_time >= pause and
-    ...         line != '  Running in a subprocess.\n'):
+    ...     if time-last_time >= pause:
     ...         # We paused!
     ...         print 'PAUSE FOUND BETWEEN THIS OUTPUT:'
     ...         print '\n'.join([last_line, line, '-'*70])
     ...     last_line, last_time = line, time
-    PAUSE FOUND BETWEEN THIS OUTPUT:
+    ... # doctest: +ELLIPSIS
+    PAUSE FOUND BETWEEN THIS OUTPUT:...
     .
     .
     ----------------------------------------------------------------------