merge from master to features

This commit is contained in:
Ronny Pfannschmidt
2018-06-26 17:00:11 +02:00
112 changed files with 1064 additions and 1227 deletions

View File

@@ -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")