IQ.Lvbs/pytest-xdist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adapt to shifted plugin names

Browse Source
This commit is contained in:
holger krekel
2010-10-11 01:15:31 +02:00
parent 025f1d577e
commit d83af5fdcd
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testing/test_dsession.py
View File

@@ -1,5 +1,5 @@
from xdist.dsession import DSession, LoadScheduling, EachScheduling 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 py
import execnet import execnet

4
xdist/plugin.py
View File

@@ -228,7 +228,7 @@ def pytest_runtest_protocol(item):
def forked_run_report(item): def forked_run_report(item):
# for now, we run setup/teardown in the subprocess # for now, we run setup/teardown in the subprocess
# XXX optionally allow sharing of setup/teardown # XXX optionally allow sharing of setup/teardown
from pytest.plugin.pytest_runner import runtestprotocol from pytest.plugin.runner import runtestprotocol
EXITSTATUS_TESTEXIT = 4 EXITSTATUS_TESTEXIT = 4
import marshal import marshal
from xdist.remote import serialize_report from xdist.remote import serialize_report
@@ -254,7 +254,7 @@ def report_process_crash(item, result):
path, lineno = item._getfslineno() path, lineno = item._getfslineno()
info = "%s:%s: running the test CRASHED with signal %d" %( info = "%s:%s: running the test CRASHED with signal %d" %(
path, lineno, result.signal) path, lineno, result.signal)
from pytest.plugin import pytest_runner as runner from pytest.plugin import runner
call = runner.CallInfo(lambda: 0/0, "???") call = runner.CallInfo(lambda: 0/0, "???")
call.excinfo = info call.excinfo = info
rep = runner.pytest_runtest_makereport(item, call) rep = runner.pytest_runtest_makereport(item, call)

2
xdist/slavemanage.py
View File

@@ -3,7 +3,7 @@ import sys, os
import execnet import execnet
import xdist.remote 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): class NodeManager(object):
def __init__(self, config, specs=None): def __init__(self, config, specs=None):