Merge pull request #5126 from blueyed/report-get_verbose_word

terminal/reports: use get_verbose_word method

Author: blueyed

src/_pytest/reports.py

@@ -148,6 +148,12 @@ def head_line(self):
             fspath, lineno, domain = self.location
             return domain
 
+    def _get_verbose_word(self, config):
+        _category, _short, verbose = config.hook.pytest_report_teststatus(
+            report=self, config=config
+        )
+        return verbose
+
     def _to_json(self):
         """
         This was originally the serialize_report() function from xdist (ca03269).

src/_pytest/terminal.py

@@ -890,14 +890,14 @@ def short_test_summary(self):
         def show_simple(stat, lines):
             failed = self.stats.get(stat, [])
             for rep in failed:
-                verbose_word = _get_report_str(self.config, rep)
+                verbose_word = rep._get_verbose_word(self.config)
                 pos = _get_pos(self.config, rep)
                 lines.append("%s %s" % (verbose_word, pos))
 
         def show_xfailed(lines):
             xfailed = self.stats.get("xfailed", [])
             for rep in xfailed:
-                verbose_word = _get_report_str(self.config, rep)
+                verbose_word = rep._get_verbose_word(self.config)
                 pos = _get_pos(self.config, rep)
                 lines.append("%s %s" % (verbose_word, pos))
                 reason = rep.wasxfail
@@ -907,7 +907,7 @@ def show_xfailed(lines):
         def show_xpassed(lines):
             xpassed = self.stats.get("xpassed", [])
             for rep in xpassed:
-                verbose_word = _get_report_str(self.config, rep)
+                verbose_word = rep._get_verbose_word(self.config)
                 pos = _get_pos(self.config, rep)
                 reason = rep.wasxfail
                 lines.append("%s %s %s" % (verbose_word, pos, reason))
@@ -917,7 +917,7 @@ def show_skipped(lines):
             fskips = _folded_skips(skipped) if skipped else []
             if not fskips:
                 return
-            verbose_word = _get_report_str(self.config, report=skipped[0])
+            verbose_word = skipped[0]._get_verbose_word(self.config)
             for num, fspath, lineno, reason in fskips:
                 if reason.startswith("Skipped: "):
                     reason = reason[9:]
@@ -929,12 +929,6 @@ def show_skipped(lines):
                 else:
                     lines.append("%s [%d] %s: %s" % (verbose_word, num, fspath, reason))
 
-        def _get_report_str(config, report):
-            _category, _short, verbose = config.hook.pytest_report_teststatus(
-                report=report, config=config
-            )
-            return verbose
-
         def _get_pos(config, rep):
             nodeid = config.cwd_relative_nodeid(rep.nodeid)
             return nodeid