adapt xdist plugin - it still uses some internal imports

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"):

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)

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: