small adaptations to py.impl move (should eventually not be neccessary to do such things)

This commit is contained in:
holger krekel
2010-01-13 17:25:13 +01:00
parent 6b75e0a740
commit 2efd4d9336
7 changed files with 11 additions and 10 deletions

View File

@@ -1,6 +1,6 @@
import py
from py.impl.test.session import Session
from py.impl.test import outcome
from py._test.session import Session
from py._test import outcome
from xdist.nodemanage import NodeManager
queue = py.builtin._tryimport('queue', 'Queue')

View File

@@ -20,6 +20,7 @@ program source code to the remote place. All test results
are reported back and displayed to your local test session.
You may specify different Python versions and interpreters.
.. _`pytest-xdist`: http://pytest.org/plugin/xdist.html
Usage examples
---------------------
@@ -202,7 +203,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 py.plugin.pytest_runner import runtestprotocol
from py._plugin.pytest_runner import runtestprotocol
EXITSTATUS_TESTEXIT = 4
from xdist.mypickle import ImmutablePickler
ipickle = ImmutablePickler(uneven=0)
@@ -230,6 +231,6 @@ 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 py.plugin.pytest_runner import ItemTestReport
from py._plugin.pytest_runner import ItemTestReport
return ItemTestReport(item, excinfo=info, when="???")

View File

@@ -10,7 +10,7 @@
import py
import sys
import execnet
from py.impl.test.session import Session
from py._test.session import Session
from xdist import util
class LooponfailingSession(Session):

View File

@@ -3,7 +3,7 @@
"""
import py
from xdist.mypickle import PickleChannel
from py.impl.test import outcome
from py._test import outcome
class TXNode(object):
""" Represents a Test Execution environment in the controlling process.