p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4188 from svenstaro/make-it-more-colorful 

Make --color more colorful
This commit is contained in:
Bruno Oliveira 2018-10-18 14:14:53 -03:00 committed by GitHub
parent 7931b5b489 f694d8d6ad
commit 43c3f59660
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -202,6 +202,7 @@ Stefan Zimmermann
Stefano Taschini Stefano Taschini
Steffen Allner Steffen Allner
Stephan Obermann Stephan Obermann
Sven-Hendrik Haase
Tadek Teleżyński Tadek Teleżyński
Tarcisio Fischer Tarcisio Fischer
Tareq Alayan Tareq Alayan

1
changelog/4188.feature.rst Normal file
View File

@ -0,0 +1 @@
Make ``--color`` emit colorful dots when not running in verbose mode. Earlier, it would only colorize the test-by-test output if ``--verbose`` was also passed.

26
src/_pytest/terminal.py
View File

@ -263,7 +263,7 @@ class TerminalReporter(object):
char = {"xfailed": "x", "skipped": "s"}.get(char, char) char = {"xfailed": "x", "skipped": "s"}.get(char, char)
return char in self.reportchars return char in self.reportchars
def write_fspath_result(self, nodeid, res): def write_fspath_result(self, nodeid, res, **markup):
fspath = self.config.rootdir.join(nodeid.split("::")[0]) fspath = self.config.rootdir.join(nodeid.split("::")[0])
if fspath != self.currentfspath: if fspath != self.currentfspath:
if self.currentfspath is not None and self._show_progress_info: if self.currentfspath is not None and self._show_progress_info:
@ -272,7 +272,7 @@ class TerminalReporter(object):
fspath = self.startdir.bestrelpath(fspath) fspath = self.startdir.bestrelpath(fspath)
self._tw.line() self._tw.line()
self._tw.write(fspath + " ") self._tw.write(fspath + " ")
self._tw.write(res) self._tw.write(res, **markup)
def write_ensure_prefix(self, prefix, extra="", **kwargs): def write_ensure_prefix(self, prefix, extra="", **kwargs):
if self.currentfspath != prefix: if self.currentfspath != prefix:
@ -386,22 +386,22 @@ class TerminalReporter(object):
# probably passed setup/teardown # probably passed setup/teardown
return return
running_xdist = hasattr(rep, "node") running_xdist = hasattr(rep, "node")
if markup is None:
if rep.passed:
markup = {"green": True}
elif rep.failed:
markup = {"red": True}
elif rep.skipped:
markup = {"yellow": True}
else:
markup = {}
if self.verbosity <= 0: if self.verbosity <= 0:
if not running_xdist and self.showfspath: if not running_xdist and self.showfspath:
self.write_fspath_result(rep.nodeid, letter) self.write_fspath_result(rep.nodeid, letter, **markup)
else: else:
self._tw.write(letter) self._tw.write(letter, **markup)
else: else:
self._progress_nodeids_reported.add(rep.nodeid) self._progress_nodeids_reported.add(rep.nodeid)
if markup is None:
if rep.passed:
markup = {"green": True}
elif rep.failed:
markup = {"red": True}
elif rep.skipped:
markup = {"yellow": True}
else:
markup = {}
line = self._locationline(rep.nodeid, *rep.location) line = self._locationline(rep.nodeid, *rep.location)
if not running_xdist: if not running_xdist:
self.write_ensure_prefix(line, word, **markup) self.write_ensure_prefix(line, word, **markup)