run-tests: include "\n" in formatted message instead of calling writeln()

So we don't have to strip "\n" from pygments output.
This commit is contained in:
Yuya Nishihara 2017-08-24 22:09:57 +09:00
parent a5ae36fcb1
commit 622a04a8fa

View File

@ -2043,21 +2043,21 @@ class TextTestRunner(unittest.TextTestRunner):
if not self._runner.options.noskips: if not self._runner.options.noskips:
for test, msg in result.skipped: for test, msg in result.skipped:
formatted = 'Skipped %s: %s' % (test.name, msg) formatted = 'Skipped %s: %s\n' % (test.name, msg)
if result.color: if result.color:
formatted = pygments.highlight( formatted = pygments.highlight(
formatted, formatted,
runnerlexer, runnerlexer,
runnerformatter).strip("\n") runnerformatter)
self.stream.writeln(formatted) self.stream.write(formatted)
for test, msg in result.failures: for test, msg in result.failures:
formatted = 'Failed %s: %s' % (test.name, msg) formatted = 'Failed %s: %s\n' % (test.name, msg)
if result.color: if result.color:
formatted = pygments.highlight( formatted = pygments.highlight(
formatted, formatted,
runnerlexer, runnerlexer,
runnerformatter).strip("\n") runnerformatter)
self.stream.writeln(formatted) self.stream.write(formatted)
for test, msg in result.errors: for test, msg in result.errors:
self.stream.writeln('Errored %s: %s' % (test.name, msg)) self.stream.writeln('Errored %s: %s' % (test.name, msg))