Tidy up buffered output a little

zopefoundation · Oct 17, 2019 · 855652f · 855652f
1 parent 87fdbdb
commit 855652f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/zope/testrunner/formatter.py b/src/zope/testrunner/formatter.py
@@ -364,15 +364,17 @@ def print_traceback(self, msg, exc_info):
     def print_std_streams(self, stdout, stderr):
         """Emit contents of buffered standard streams."""
         if stdout:
-            sys.stdout.write("\nStdout:\n")
+            sys.stdout.write("Stdout:\n")
             sys.stdout.write(stdout)
             if not stdout.endswith("\n"):
                 sys.stdout.write("\n")
+            sys.stdout.write("\n")
         if stderr:
-            sys.stderr.write("\nStderr:\n")
+            sys.stderr.write("Stderr:\n")
             sys.stderr.write(stderr)
             if not stderr.endswith("\n"):
                 sys.stderr.write("\n")
+            sys.stderr.write("\n")
 
     def format_traceback(self, exc_info):
         """Format the traceback."""

diff --git a/src/zope/testrunner/tests/testrunner-errors.rst b/src/zope/testrunner/tests/testrunner-errors.rst
@@ -387,7 +387,6 @@ for failing and erroring tests.
         raise Exception("boom")
     Exception: boom
     <BLANKLINE>
-    <BLANKLINE>
     Stderr:
     stderr output on error
     <BLANKLINE>
@@ -398,7 +397,6 @@ for failing and erroring tests.
         self.assertTrue(False)
     AssertionError: False is not true
     <BLANKLINE>
-    <BLANKLINE>
     Stderr:
     stderr output on failure
     <BLANKLINE>
@@ -409,7 +407,6 @@ for failing and erroring tests.
         raise Exception("boom")
     Exception: boom
     <BLANKLINE>
-    <BLANKLINE>
     Stdout:
     stdout output on error
     <BLANKLINE>
@@ -420,7 +417,6 @@ for failing and erroring tests.
         self.assertTrue(False)
     AssertionError: False is not true
     <BLANKLINE>
-    <BLANKLINE>
     Stdout:
     stdout output on failure
       Ran 6 tests with 2 failures, 2 errors and 0 skipped in N.NNN seconds.