diff --git a/testing/test_dsession.py b/testing/test_dsession.py index a0732a0..a1671d3 100644 --- a/testing/test_dsession.py +++ b/testing/test_dsession.py @@ -1,5 +1,5 @@ from xdist.dsession import DSession, LoadScheduling, EachScheduling -from pytest.plugin import pytest_session as outcome +from pytest.plugin import session as outcome import py import execnet diff --git a/xdist/plugin.py b/xdist/plugin.py index 6596411..7d62cee 100644 --- a/xdist/plugin.py +++ b/xdist/plugin.py @@ -228,7 +228,7 @@ def pytest_runtest_protocol(item): def forked_run_report(item): # for now, we run setup/teardown in the subprocess # XXX optionally allow sharing of setup/teardown - from pytest.plugin.pytest_runner import runtestprotocol + from pytest.plugin.runner import runtestprotocol EXITSTATUS_TESTEXIT = 4 import marshal from xdist.remote import serialize_report @@ -254,7 +254,7 @@ def report_process_crash(item, result): path, lineno = item._getfslineno() info = "%s:%s: running the test CRASHED with signal %d" %( path, lineno, result.signal) - from pytest.plugin import pytest_runner as runner + from pytest.plugin import runner call = runner.CallInfo(lambda: 0/0, "???") call.excinfo = info rep = runner.pytest_runtest_makereport(item, call) diff --git a/xdist/slavemanage.py b/xdist/slavemanage.py index 93eead0..a97e78a 100644 --- a/xdist/slavemanage.py +++ b/xdist/slavemanage.py @@ -3,7 +3,7 @@ import sys, os import execnet import xdist.remote -from pytest.plugin import pytest_runner as runner # XXX load dynamically +from pytest.plugin import runner # XXX load dynamically class NodeManager(object): def __init__(self, config, specs=None):