diff options
author | Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com> | 2018-06-26 17:00:11 +0200 |
---|---|---|
committer | Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com> | 2018-06-26 17:01:05 +0200 |
commit | 89e0a3ec27309e0f2c27887c2eaee8fde612d460 (patch) | |
tree | 4998a025abe302da0731bfec198185031416fa99 /testing/test_cacheprovider.py | |
parent | 5b186cd609ae651a5a7e4f0cf1bbef466b51345d (diff) | |
parent | f93995e15c377d9050eb09bcf9518914067ff402 (diff) | |
download | pytest-89e0a3ec27309e0f2c27887c2eaee8fde612d460.tar.gz |
merge from master to features
Diffstat (limited to 'testing/test_cacheprovider.py')
-rw-r--r-- | testing/test_cacheprovider.py | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/testing/test_cacheprovider.py b/testing/test_cacheprovider.py index 9190aecdd..7c51b770d 100644 --- a/testing/test_cacheprovider.py +++ b/testing/test_cacheprovider.py @@ -12,7 +12,6 @@ pytest_plugins = ("pytester",) class TestNewAPI(object): - def test_config_cache_makedir(self, testdir): testdir.makeini("[pytest]") config = testdir.parseconfigure() @@ -184,7 +183,6 @@ def test_cache_show(testdir): class TestLastFailed(object): - def test_lastfailed_usecase(self, testdir, monkeypatch): monkeypatch.setenv("PYTHONDONTWRITEBYTECODE", 1) p = testdir.makepyfile( @@ -559,10 +557,9 @@ class TestLastFailed(object): ) result = testdir.runpytest() result.stdout.fnmatch_lines("*1 failed*") - assert ( - self.get_cached_last_failed(testdir) - == ["test_xfail_strict_considered_failure.py::test"] - ) + assert self.get_cached_last_failed(testdir) == [ + "test_xfail_strict_considered_failure.py::test" + ] @pytest.mark.parametrize("mark", ["mark.xfail", "mark.skip"]) def test_failed_changed_to_xfail_or_skip(self, testdir, mark): @@ -574,10 +571,9 @@ class TestLastFailed(object): """ ) result = testdir.runpytest() - assert ( - self.get_cached_last_failed(testdir) - == ["test_failed_changed_to_xfail_or_skip.py::test"] - ) + assert self.get_cached_last_failed(testdir) == [ + "test_failed_changed_to_xfail_or_skip.py::test" + ] assert result.ret == 1 testdir.makepyfile( @@ -621,10 +617,10 @@ class TestLastFailed(object): """ ) testdir.runpytest() - assert ( - self.get_cached_last_failed(testdir) - == ["test_bar.py::test_bar_2", "test_foo.py::test_foo_4"] - ) + assert self.get_cached_last_failed(testdir) == [ + "test_bar.py::test_bar_2", + "test_foo.py::test_foo_4", + ] # 2. fix test_bar_2, run only test_bar.py testdir.makepyfile( @@ -697,7 +693,6 @@ class TestLastFailed(object): class TestNewFirst(object): - def test_newfirst_usecase(self, testdir): testdir.makepyfile( **{ @@ -823,7 +818,6 @@ class TestNewFirst(object): class TestReadme(object): - def check_readme(self, testdir): config = testdir.parseconfigure() readme = config.cache._cachedir.joinpath("README.md") |