Show More
@@ -611,6 +611,18 b' def log(*msg):' | |||||
611 | print() |
|
611 | print() | |
612 | sys.stdout.flush() |
|
612 | sys.stdout.flush() | |
613 |
|
613 | |||
|
614 | def highlightdiff(line, color): | |||
|
615 | if not color: | |||
|
616 | return line | |||
|
617 | assert pygmentspresent | |||
|
618 | return pygments.highlight(line, difflexer, terminal256formatter) | |||
|
619 | ||||
|
620 | def highlightmsg(msg, color): | |||
|
621 | if not color: | |||
|
622 | return msg | |||
|
623 | assert pygmentspresent | |||
|
624 | return pygments.highlight(msg, runnerlexer, runnerformatter) | |||
|
625 | ||||
614 | def terminate(proc): |
|
626 | def terminate(proc): | |
615 | """Terminate subprocess""" |
|
627 | """Terminate subprocess""" | |
616 | vlog('# Terminating process %d' % proc.pid) |
|
628 | vlog('# Terminating process %d' % proc.pid) | |
@@ -1636,12 +1648,7 b' class TestResult(unittest._TextTestResul' | |||||
1636 | else: |
|
1648 | else: | |
1637 | if not self._options.nodiff: |
|
1649 | if not self._options.nodiff: | |
1638 | formatted = '\nERROR: %s output changed\n' % test |
|
1650 | formatted = '\nERROR: %s output changed\n' % test | |
1639 |
if self.color |
|
1651 | self.stream.write(highlightmsg(formatted, self.color)) | |
1640 | formatted = pygments.highlight( |
|
|||
1641 | formatted, |
|
|||
1642 | runnerlexer, |
|
|||
1643 | runnerformatter) |
|
|||
1644 | self.stream.write(formatted) |
|
|||
1645 | self.stream.write('!') |
|
1652 | self.stream.write('!') | |
1646 |
|
1653 | |||
1647 | self.stream.flush() |
|
1654 | self.stream.flush() | |
@@ -1707,10 +1714,7 b' class TestResult(unittest._TextTestResul' | |||||
1707 | else: |
|
1714 | else: | |
1708 | self.stream.write('\n') |
|
1715 | self.stream.write('\n') | |
1709 | for line in lines: |
|
1716 | for line in lines: | |
1710 |
if self.color |
|
1717 | line = highlightdiff(line, self.color) | |
1711 | line = pygments.highlight(line, |
|
|||
1712 | difflexer, |
|
|||
1713 | terminal256formatter) |
|
|||
1714 | if PYTHON3: |
|
1718 | if PYTHON3: | |
1715 | self.stream.flush() |
|
1719 | self.stream.flush() | |
1716 | self.stream.buffer.write(line) |
|
1720 | self.stream.buffer.write(line) | |
@@ -2044,20 +2048,10 b' class TextTestRunner(unittest.TextTestRu' | |||||
2044 | if not self._runner.options.noskips: |
|
2048 | if not self._runner.options.noskips: | |
2045 | for test, msg in result.skipped: |
|
2049 | for test, msg in result.skipped: | |
2046 | formatted = 'Skipped %s: %s\n' % (test.name, msg) |
|
2050 | formatted = 'Skipped %s: %s\n' % (test.name, msg) | |
2047 |
if result.color |
|
2051 | self.stream.write(highlightmsg(formatted, result.color)) | |
2048 | formatted = pygments.highlight( |
|
|||
2049 | formatted, |
|
|||
2050 | runnerlexer, |
|
|||
2051 | runnerformatter) |
|
|||
2052 | self.stream.write(formatted) |
|
|||
2053 | for test, msg in result.failures: |
|
2052 | for test, msg in result.failures: | |
2054 | formatted = 'Failed %s: %s\n' % (test.name, msg) |
|
2053 | formatted = 'Failed %s: %s\n' % (test.name, msg) | |
2055 | if result.color: |
|
2054 | self.stream.write(highlightmsg(formatted, result.color)) | |
2056 | formatted = pygments.highlight( |
|
|||
2057 | formatted, |
|
|||
2058 | runnerlexer, |
|
|||
2059 | runnerformatter) |
|
|||
2060 | self.stream.write(formatted) |
|
|||
2061 | for test, msg in result.errors: |
|
2055 | for test, msg in result.errors: | |
2062 | self.stream.writeln('Errored %s: %s' % (test.name, msg)) |
|
2056 | self.stream.writeln('Errored %s: %s' % (test.name, msg)) | |
2063 |
|
2057 |
General Comments 0
You need to be logged in to leave comments.
Login now