Merge pull request #3886 from nicoddemus/ff-quiet

Cache now obeys -q when showing summary for --lf and --ff
This commit is contained in:
Anthony Sottile 2018-08-26 18:32:22 -07:00 committed by GitHub
commit 10544c4cb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 1 deletions

View File

@ -0,0 +1 @@
Cache plugin now obeys the ``-q`` flag when ``--last-failed`` and ``--failed-first`` flags are used.

View File

@ -132,7 +132,7 @@ class LFPlugin(object):
self._no_failures_behavior = self.config.getoption("last_failed_no_failures")
def pytest_report_collectionfinish(self):
if self.active:
if self.active and self.config.getoption("verbose") >= 0:
if not self._previously_failed_count:
mode = "run {} (no recorded failures)".format(
self._no_failures_behavior

View File

@ -559,6 +559,19 @@ class TestLastFailed(object):
testdir.runpytest("-q", "--lf")
assert os.path.exists(".pytest_cache/v/cache/lastfailed")
@pytest.mark.parametrize("quiet", [True, False])
@pytest.mark.parametrize("opt", ["--ff", "--lf"])
def test_lf_and_ff_obey_verbosity(self, quiet, opt, testdir):
testdir.makepyfile("def test(): pass")
args = [opt]
if quiet:
args.append("-q")
result = testdir.runpytest(*args)
if quiet:
assert "run all" not in result.stdout.str()
else:
assert "run all" in result.stdout.str()
def test_xfail_not_considered_failure(self, testdir):
testdir.makepyfile(
"""