fixes for new internal pytest tmpdir handling

testing/acceptance_test.py

@@ -72,10 +72,10 @@ class TestDistribution:
 
     def test_basetemp_in_subprocesses(self, testdir):
         p1 = testdir.makepyfile("""
-            def test_send(pytestconfig):
-                bt = pytestconfig.getbasetemp()
-                assert bt.basename.startswith("popen-")
-        """)
+            def test_send(tmpdir):
+                import py
+                assert tmpdir.relto(py.path.local(%r)), tmpdir
+        """ % str(testdir.tmpdir))
         result = testdir.runpytest(p1, "-n1")
         assert result.ret == 0
         result.stdout.fnmatch_lines([

testing/test_remote.py

@@ -34,7 +34,7 @@ class SlaveSetup:
         self.testdir.chdir()
         #import os ; os.environ['EXECNET_DEBUG'] = "2"
         self.gateway = execnet.makegateway()
-        self.config = config = self.testdir.parseconfig()
+        self.config = config = self.testdir.parseconfigure()
         putevent = self.use_callback and self.events.put or None
         self.slp = SlaveController(None, self.gateway, config, putevent)
         self.request.addfinalizer(self.slp.ensure_teardown)

testing/test_slavemanage.py

@@ -17,11 +17,9 @@ def pytest_funcarg__hook(request):
 
 class pytest_funcarg__mysetup:
     def __init__(self, request):
-        basetemp = request.config.mktemp(
-            "mysetup-%s" % request.function.__name__,
-            numbered=True)
-        self.source = basetemp.mkdir("source")
-        self.dest = basetemp.mkdir("dest")
+        temp = request.getfuncargvalue("tmpdir")
+        self.source = temp.mkdir("source")
+        self.dest = temp.mkdir("dest")
         request.getfuncargvalue("_pytest")
 
 class TestGatewayManagerPopen:
@@ -220,7 +218,7 @@ class TestNodeManager:
         specs = ["popen"] * 2
         source.join("conftest.py").write("rsyncdirs = ['a']")
         source.ensure('a', dir=1)
-        config = testdir.reparseconfig([source, '--debug'])
+        config = testdir.parseconfigure(source, '--debug')
         assert config.option.debug
         nodemanager = NodeManager(config, specs)
         reprec = testdir.getreportrecorder(config).hookrecorder