diff options
Diffstat (limited to 'Lib/unittest/result.py')
| -rw-r--r-- | Lib/unittest/result.py | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Lib/unittest/result.py b/Lib/unittest/result.py index 5cab30e..b9045f4 100644 --- a/Lib/unittest/result.py +++ b/Lib/unittest/result.py @@ -19,9 +19,8 @@ def failfast(method): return method(self, *args, **kw) return inner -NEWLINE = os.linesep -STDOUT_LINE = '%sStdout:%s%%s' % (NEWLINE, NEWLINE) -STDERR_LINE = '%sStderr:%s%%s' % (NEWLINE, NEWLINE) +STDOUT_LINE = '\nStdout:\n%s' +STDERR_LINE = '\nStderr:\n%s' class TestResult(object): @@ -77,12 +76,12 @@ class TestResult(object): output = sys.stdout.getvalue() error = sys.stderr.getvalue() if output: - if not output.endswith(NEWLINE): - output += NEWLINE + if not output.endswith('\n'): + output += '\n' self._original_stdout.write(STDOUT_LINE % output) if error: - if not error.endswith(NEWLINE): - error += NEWLINE + if not error.endswith('\n'): + error += '\n' self._original_stderr.write(STDERR_LINE % error) sys.stdout = self._original_stdout @@ -158,12 +157,12 @@ class TestResult(object): output = sys.stdout.getvalue() error = sys.stderr.getvalue() if output: - if not output.endswith(NEWLINE): - output += NEWLINE + if not output.endswith('\n'): + output += '\n' msgLines.append(STDOUT_LINE % output) if error: - if not error.endswith(NEWLINE): - error += NEWLINE + if not error.endswith('\n'): + error += '\n' msgLines.append(STDERR_LINE % error) return ''.join(msgLines) |