Skip to content

Commit 9374114

Browse files
committed
terminal/reports: add/use _get_verbose_word method
1 parent 19035f4 commit 9374114

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/_pytest/reports.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,12 @@ def head_line(self):
148148
fspath, lineno, domain = self.location
149149
return domain
150150

151+
def _get_verbose_word(self, config):
152+
_category, _short, verbose = config.hook.pytest_report_teststatus(
153+
report=self, config=config
154+
)
155+
return verbose
156+
151157
def _to_json(self):
152158
"""
153159
This was originally the serialize_report() function from xdist (ca03269).

src/_pytest/terminal.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -888,14 +888,14 @@ def short_test_summary(self):
888888
def show_simple(stat, lines):
889889
failed = self.stats.get(stat, [])
890890
for rep in failed:
891-
verbose_word = _get_report_str(self.config, rep)
891+
verbose_word = rep._get_verbose_word(self.config)
892892
pos = _get_pos(self.config, rep)
893893
lines.append("%s %s" % (verbose_word, pos))
894894

895895
def show_xfailed(lines):
896896
xfailed = self.stats.get("xfailed", [])
897897
for rep in xfailed:
898-
verbose_word = _get_report_str(self.config, rep)
898+
verbose_word = rep._get_verbose_word(self.config)
899899
pos = _get_pos(self.config, rep)
900900
lines.append("%s %s" % (verbose_word, pos))
901901
reason = rep.wasxfail
@@ -905,7 +905,7 @@ def show_xfailed(lines):
905905
def show_xpassed(lines):
906906
xpassed = self.stats.get("xpassed", [])
907907
for rep in xpassed:
908-
verbose_word = _get_report_str(self.config, rep)
908+
verbose_word = rep._get_verbose_word(self.config)
909909
pos = _get_pos(self.config, rep)
910910
reason = rep.wasxfail
911911
lines.append("%s %s %s" % (verbose_word, pos, reason))
@@ -915,7 +915,7 @@ def show_skipped(lines):
915915
fskips = _folded_skips(skipped) if skipped else []
916916
if not fskips:
917917
return
918-
verbose_word = _get_report_str(self.config, report=skipped[0])
918+
verbose_word = skipped[0]._get_verbose_word(self.config)
919919
for num, fspath, lineno, reason in fskips:
920920
if reason.startswith("Skipped: "):
921921
reason = reason[9:]
@@ -927,12 +927,6 @@ def show_skipped(lines):
927927
else:
928928
lines.append("%s [%d] %s: %s" % (verbose_word, num, fspath, reason))
929929

930-
def _get_report_str(config, report):
931-
_category, _short, verbose = config.hook.pytest_report_teststatus(
932-
report=report, config=config
933-
)
934-
return verbose
935-
936930
def _get_pos(config, rep):
937931
nodeid = config.cwd_relative_nodeid(rep.nodeid)
938932
return nodeid

0 commit comments

Comments
 (0)