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

reduce the complexity of skipping terminal summary

This commit is contained in:
Ronny Pfannschmidt 2018-02-22 14:18:49 +01:00
parent cf40c0743c
commit 25a3e9296a
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
_pytest/skipping.py
View File

@ -185,18 +185,8 @@ def pytest_terminal_summary(terminalreporter):
lines = [] lines = []
for char in tr.reportchars: for char in tr.reportchars:
if char == "x": action = REPORTCHAR_ACTIONS.get(char, lambda tr, lines: None)
show_xfailed(terminalreporter, lines) action(terminalreporter, lines)
elif char == "X":
show_xpassed(terminalreporter, lines)
elif char in "fF":
show_simple(terminalreporter, lines, 'failed', "FAIL %s")
elif char in "sS":
show_skipped(terminalreporter, lines)
elif char == "E":
show_simple(terminalreporter, lines, 'error', "ERROR %s")
elif char == 'p':
show_simple(terminalreporter, lines, 'passed', "PASSED %s")
if lines: if lines:
tr._tw.sep("=", "short test summary info") tr._tw.sep("=", "short test summary info")
@ -274,3 +264,22 @@ def show_skipped(terminalreporter, lines):
lines.append( lines.append(
"SKIP [%d] %s: %s" % "SKIP [%d] %s: %s" %
(num, fspath, reason)) (num, fspath, reason))
def shower(stat, format):
def show_(terminalreporter, lines):
return show_simple(terminalreporter, lines, stat, format)
return show_
REPORTCHAR_ACTIONS = {
'x': show_xfailed,
'X': show_xpassed,
'f': shower('failed', "FAIL %s"),
'F': shower('failed', "FAIL %s"),
's': show_skipped,
'S': show_skipped,
'p': shower('passed', "PASSED %s"),
'E': shower('error', "ERROR %s")
}