last-failed: display skipped-files msg always

pytest-dev · May 29, 2019 · ff80464 · ff80464
1 parent 480dd9e
commit ff80464
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/src/_pytest/cacheprovider.py b/src/_pytest/cacheprovider.py
@@ -233,19 +233,15 @@ def pytest_collection_modifyitems(self, session, config, items):
                     items[:] = previously_failed + previously_passed
 
                 noun = "failure" if self._previously_failed_count == 1 else "failures"
-                if self._skipped_files > 0:
-                    files_noun = "file" if self._skipped_files == 1 else "files"
-                    skipped_files_msg = " (skipped {files} {files_noun})".format(
-                        files=self._skipped_files, files_noun=files_noun
-                    )
-                else:
-                    skipped_files_msg = ""
                 suffix = " first" if self.config.getoption("failedfirst") else ""
-                self._report_status = "rerun previous {count} {noun}{suffix}{skipped_files}".format(
-                    count=self._previously_failed_count,
-                    suffix=suffix,
-                    noun=noun,
-                    skipped_files=skipped_files_msg,
+                self._report_status = "rerun previous {count} {noun}{suffix}".format(
+                    count=self._previously_failed_count, suffix=suffix, noun=noun
+                )
+
+            if self._skipped_files > 0:
+                files_noun = "file" if self._skipped_files == 1 else "files"
+                self._report_status += " (skipped {files} {files_noun})".format(
+                    files=self._skipped_files, files_noun=files_noun
                 )
         else:
             self._report_status = "no previously failed tests, "

diff --git a/testing/test_cacheprovider.py b/testing/test_cacheprovider.py
@@ -869,7 +869,7 @@ def test_lastfailed_with_known_failures_not_being_selected(self, testdir):
         result.stdout.fnmatch_lines(
             [
                 "collected 1 item",
-                "run-last-failure: 1 known failures not in selected tests",
+                "run-last-failure: 1 known failures not in selected tests (skipped 1 file)",
                 "* 1 failed in *",
             ]
         )