Support older pytest versions

This commit is contained in:
Michael Elovskikh
2016-10-10 21:07:31 +05:00
parent cf863fd38a
commit 753f9241a7
2 changed files with 2 additions and 2 deletions

View File

@@ -521,7 +521,7 @@ class DSession:
# prohibit collection of test items in master process
return True
@pytest.hookimpl(trylast=True)
@pytest.mark.trylast
def pytest_xdist_make_scheduler(self, numnodes, log, config):
dist = config.getvalue("dist")
if dist == "load":

View File

@@ -47,7 +47,7 @@ def pytest_xdist_node_collection_finished(node, ids):
"""
@pytest.hookspec(firstresult=True)
@pytest.mark.firstresult
def pytest_xdist_make_scheduler(numnodes, log, config):
"""Return a node scheduler implementation, or None.
"""