adapt pytest to pluggy's decoratorclass branch

--HG--
branch : pluggy1
This commit is contained in:
holger krekel
2015-04-29 16:40:52 +02:00
parent 5ee7ee0850
commit 25963e0544
6 changed files with 43 additions and 17 deletions

View File

@@ -357,9 +357,9 @@ def test_load_initial_conftest_last_ordering(testdir):
pm.register(m)
hc = pm.hook.pytest_load_initial_conftests
l = hc._nonwrappers + hc._wrappers
assert l[-1].__module__ == "_pytest.capture"
assert l[-2] == m.pytest_load_initial_conftests
assert l[-3].__module__ == "_pytest.config"
assert l[-1].function.__module__ == "_pytest.capture"
assert l[-2].function == m.pytest_load_initial_conftests
assert l[-3].function.__module__ == "_pytest.config"
class TestWarning:
def test_warn_config(self, testdir):