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

Merge pull request #5117 from blueyed/cov-terminal 

Minor coverage improvements for terminal plugin
This commit is contained in:
Anthony Sottile 2019-04-15 14:30:18 -07:00 committed by GitHub
parent 990133f804 7412df0920
commit 3cff5e252d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/_pytest/terminal.py
View File

@ -165,7 +165,6 @@ def getreportopt(config):
reportchars += "w" reportchars += "w"
elif config.option.disable_warnings and "w" in reportchars: elif config.option.disable_warnings and "w" in reportchars:
reportchars = reportchars.replace("w", "") reportchars = reportchars.replace("w", "")
if reportchars:
for char in reportchars: for char in reportchars:
if char == "a": if char == "a":
reportopts = "sxXwEf" reportopts = "sxXwEf"
@ -855,10 +854,8 @@ class TerminalReporter(object):
msg = self._getfailureheadline(rep) msg = self._getfailureheadline(rep)
if rep.when == "collect": if rep.when == "collect":
msg = "ERROR collecting " + msg msg = "ERROR collecting " + msg
elif rep.when == "setup": else:
msg = "ERROR at setup of " + msg msg = "ERROR at %s of %s" % (rep.when, msg)
elif rep.when == "teardown":
msg = "ERROR at teardown of " + msg
self.write_sep("_", msg, red=True, bold=True) self.write_sep("_", msg, red=True, bold=True)
self._outrep_summary(rep) self._outrep_summary(rep)