floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'issue_960' of https://github.com/Akasurde/pytest

Browse Source
This commit is contained in:
Bruno Oliveira
2015-09-12 10:57:23 -03:00
parent e622975ffd dd69394598
commit 41d2faccea
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
_pytest/terminal.py
View File

@@ -21,7 +21,7 @@ def pytest_addoption(parser):
group._addoption('-r',
action="store", dest="reportchars", default=None, metavar="chars",
help="show extra test summary info as specified by chars (f)ailed, "
"(E)error, (s)skipped, (x)failed, (X)passed (w)warnings.")
"(E)error, (s)skipped, (x)failed, (X)passed (w)warnings (a)all.")
group._addoption('-l', '--showlocals',
action="store_true", dest="showlocals", default=False,
help="show locals in tracebacks (disabled by default).")
@@ -66,8 +66,10 @@ def getreportopt(config):
reportchars = config.option.reportchars
if reportchars:
for char in reportchars:
if char not in reportopts:
if char not in reportopts and char != 'a':
reportopts += char
elif char == 'a':
reportopts = 'fEsxXw'
return reportopts
def pytest_report_teststatus(report):