From 06ab38a2fcfae8e48f9024f129434185c30ad9bb Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sun, 3 Feb 2013 20:47:39 +0100
Subject: [PATCH] strip old comment and hack

---
 _pytest/pytester.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/_pytest/pytester.py b/_pytest/pytester.py
index d07c56040..ac1196610 100644
--- a/_pytest/pytester.py
+++ b/_pytest/pytester.py
@@ -195,10 +195,7 @@ class TmpTestdir:
             except py.error.EEXIST:
                 continue
             break
-        # we need to create another subdir
-        # because Directory.collect() currently loads
-        # conftest.py from sibling directories
-        self.tmpdir = tmpdir.mkdir(name)
+        self.tmpdir = tmpdir
         self.plugins = []
         self._syspathremove = []
         self.chdir() # always chdir
@@ -422,7 +419,8 @@ class TmpTestdir:
             str(os.getcwd()), env.get('PYTHONPATH', '')]))
         kw['env'] = env
         #print "env", env
-        return py.std.subprocess.Popen(cmdargs, stdout=stdout, stderr=stderr, **kw)
+        return py.std.subprocess.Popen(cmdargs,
+                                       stdout=stdout, stderr=stderr, **kw)
 
     def pytestmain(self, *args, **kwargs):
         class ResetCapturing: