From 025f1d577e872916b4040c56231525934a31ea6e Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sun, 10 Oct 2010 15:33:32 +0200
Subject: [PATCH] adapt xdist plugin - it still uses some internal imports

---
 setup.py                    | 2 +-
 testing/acceptance_test.py  | 2 ++
 testing/test_dsession.py    | 4 ++--
 testing/test_slavemanage.py | 4 ++--
 xdist/looponfail.py         | 2 +-
 xdist/plugin.py             | 4 ++--
 xdist/slavemanage.py        | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/setup.py b/setup.py
index 2e7aba5..d044b40 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ setup(
     packages = ['xdist'],
     entry_points = {'pytest11': ['xdist = xdist.plugin'],},
     zip_safe=False,
-    install_requires = ['execnet>=1.0.7', 'py>1.3.9'],
+    install_requires = ['execnet>=1.0.7', 'pylib>1.3.9'],
     classifiers=[
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
index 9a1eac1..41cd789 100644
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -236,6 +236,8 @@ class TestDistEach:
         assert not result.ret
         result.stdout.fnmatch_lines(["*2 pass*"])
 
+    @py.test.mark.xfail(run=False,
+        reason="other python versions might not have py.test installed")
     def test_simple_diffoutput(self, testdir):
         interpreters = []
         for name in ("python2.5", "python2.6"):
diff --git a/testing/test_dsession.py b/testing/test_dsession.py
index c5c68b9..a0732a0 100644
--- a/testing/test_dsession.py
+++ b/testing/test_dsession.py
@@ -1,5 +1,5 @@
 from xdist.dsession import DSession, LoadScheduling, EachScheduling
-from py._test import session as outcome
+from pytest.plugin import pytest_session as outcome
 import py
 import execnet
 
@@ -140,7 +140,7 @@ class TestDistReporter:
     @py.test.mark.xfail
     def test_rsync_printing(self, testdir, linecomp):
         config = testdir.parseconfig()
-        from py._plugin.pytest_terminal import TerminalReporter
+        from pytest.plugin.pytest_terminal import TerminalReporter
         rep = TerminalReporter(config, file=linecomp.stringio)
         config.pluginmanager.register(rep, "terminalreporter")
         dsession = DSession(config)
diff --git a/testing/test_slavemanage.py b/testing/test_slavemanage.py
index 084d28e..81e7b73 100644
--- a/testing/test_slavemanage.py
+++ b/testing/test_slavemanage.py
@@ -11,8 +11,8 @@ def pytest_funcarg__hookrecorder(request):
 
 def pytest_funcarg__hook(request):
     from xdist import newhooks
-    from py._test.pluginmanager import HookRelay, Registry
-    from py._plugin import hookspec
+    from pytest.pluginmanager import HookRelay, Registry
+    from pytest.plugin import hookspec
     return HookRelay([hookspec, newhooks], Registry())
 
 class pytest_funcarg__mysetup:
diff --git a/xdist/looponfail.py b/xdist/looponfail.py
index aed5404..cb6b046 100644
--- a/xdist/looponfail.py
+++ b/xdist/looponfail.py
@@ -10,11 +10,11 @@
 import py
 import sys
 import execnet
-from py._test.session import gettopdir
 
 def looponfail_main(config):
     remotecontrol = RemoteControl(config)
     # XXX better configure rootdir
+    gettopdir = config.pluginmanager.getplugin("session").gettopdir
     rootdirs = [gettopdir(config.args)]
     statrecorder = StatRecorder(rootdirs)
     try:
diff --git a/xdist/plugin.py b/xdist/plugin.py
index 5179632..6596411 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 py._plugin.pytest_runner import runtestprotocol
+    from pytest.plugin.pytest_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 py._plugin import pytest_runner as runner
+    from pytest.plugin import pytest_runner as 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 85c39da..93eead0 100644
--- a/xdist/slavemanage.py
+++ b/xdist/slavemanage.py
@@ -3,7 +3,7 @@ import sys, os
 import execnet
 import xdist.remote
 
-from py._plugin import pytest_runner as runner # XXX load dynamically
+from pytest.plugin import pytest_runner as runner # XXX load dynamically
 
 class NodeManager(object):
     def __init__(self, config, specs=None):