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

testing/test_dsession.py

@@ -1,5 +1,5 @@
 from xdist.dsession import DSession
-from py.impl.test import outcome
+from py._test import outcome
 import py
 import execnet
 

testing/test_gwmanage.py

@@ -1,8 +1,8 @@
 import py
 import os
 from xdist.gwmanage import GatewayManager, HostRSync
-from py.impl.test.pluginmanager import HookRelay, Registry
+from py._test.pluginmanager import HookRelay, Registry
-from py.plugin import hookspec
+from py._plugin import hookspec
 import execnet
 
 def pytest_funcarg__hookrecorder(request):

testing/test_pickling.py

@@ -66,7 +66,7 @@ class TestImmutablePickling:
 
 class TestConfigPickling:
     def test_config_getstate_setstate(self, testdir):
-        from py.impl.test.config import Config
+        from py._test.config import Config
         testdir.makepyfile(__init__="", conftest="x=1; y=2")
         hello = testdir.makepyfile(hello="")
         tmp = testdir.tmpdir

xdist/dsession.py

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

xdist/plugin.py

@@ -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="???")
 

xdist/remote.py

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

xdist/txnode.py

@@ -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.