--- a/tests/run-tests.py Sun Aug 13 00:17:13 2017 -0700
+++ b/tests/run-tests.py Fri Aug 11 14:21:49 2017 +0200
@@ -94,13 +94,48 @@
try: # is pygments installed
import pygments
import pygments.lexers as lexers
+ import pygments.lexer as lexer
import pygments.formatters as formatters
+ import pygments.token as token
+ import pygments.style as style
pygmentspresent = True
difflexer = lexers.DiffLexer()
terminal256formatter = formatters.Terminal256Formatter()
except ImportError:
pass
+if pygmentspresent:
+ class TestRunnerStyle(style.Style):
+ default_style = ""
+ skipped = token.string_to_tokentype("Token.Generic.Skipped")
+ failed = token.string_to_tokentype("Token.Generic.Failed")
+ error = token.string_to_tokentype("Token.Generic.Error")
+ skippedname = token.string_to_tokentype("Token.Generic.SName")
+ failedname = token.string_to_tokentype("Token.Generic.FName")
+ styles = {
+ skipped: '#e5e5e5',
+ skippedname: '#00ffff',
+ failed: '#7f0000',
+ failedname: '#ff0000',
+ }
+
+ class TestRunnerLexer(lexer.RegexLexer):
+ tokens = {
+ 'root': [
+ (r'^Skipped', token.Generic.Skipped, 'skipped'),
+ (r'^Failed ', token.Generic.Failed, 'failed'),
+ (r'^ERROR: ', token.Generic.Failed, 'failed'),
+ ],
+ 'skipped': [
+ (r'[\w-]+\.t', token.Generic.SName),
+ (r':.*', token.Generic.Skipped),
+ ],
+ 'failed': [
+ (r'[\w-]+\.t', token.Generic.FName),
+ (r'(:| ).*', token.Generic.Failed),
+ ]
+ }
+
if sys.version_info > (3, 5, 0):
PYTHON3 = True
xrange = range # we use xrange in one place, and we'd rather not use range
@@ -1598,7 +1633,14 @@
self.stream.write('t')
else:
if not self._options.nodiff:
- self.stream.write('\nERROR: %s output changed\n' % test)
+ formatted = '\nERROR: %s output changed\n' % test
+ if self.color:
+ formatted = pygments.highlight(
+ formatted,
+ TestRunnerLexer(),
+ formatters.Terminal256Formatter(
+ style=TestRunnerStyle))
+ self.stream.write(formatted)
self.stream.write('!')
self.stream.flush()
@@ -2000,9 +2042,23 @@
if not self._runner.options.noskips:
for test, msg in result.skipped:
- self.stream.writeln('Skipped %s: %s' % (test.name, msg))
+ formatted = 'Skipped %s: %s' % (test.name, msg)
+ if result.color:
+ formatted = pygments.highlight(
+ formatted,
+ TestRunnerLexer(),
+ formatters.Terminal256Formatter(
+ style=TestRunnerStyle)).strip("\n")
+ self.stream.writeln(formatted)
for test, msg in result.failures:
- self.stream.writeln('Failed %s: %s' % (test.name, msg))
+ formatted = 'Failed %s: %s' % (test.name, msg)
+ if result.color:
+ formatted = pygments.highlight(
+ formatted,
+ TestRunnerLexer(),
+ formatters.Terminal256Formatter(
+ style=TestRunnerStyle)).strip("\n")
+ self.stream.writeln(formatted)
for test, msg in result.errors:
self.stream.writeln('Errored %s: %s' % (test.name, msg))
--- a/tests/test-run-tests.t Sun Aug 13 00:17:13 2017 -0700
+++ b/tests/test-run-tests.t Fri Aug 11 14:21:49 2017 +0200
@@ -131,10 +131,9 @@
\x1b[38;5;34m+ bar*baz (glob)\x1b[39m (esc)
bar*bad (glob)
\x1b[38;5;124m- bar*baz (glob)\x1b[39m (esc)
-
- ERROR: test-failure.t output changed
+ \x1b[38;5;88mERROR: \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m output changed\x1b[39m (esc)
!
- Failed test-failure.t: output changed
+ \x1b[38;5;88mFailed \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m: output changed\x1b[39m (esc)
# Ran 1 tests, 0 skipped, 1 failed.
python hash seed: * (glob)
[1]