p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strip old comment and hack

This commit is contained in:
holger krekel 2013-02-03 20:47:39 +01:00
parent e007f2dc54
commit 06ab38a2fc
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_pytest/pytester.py
View File

@ -195,10 +195,7 @@ class TmpTestdir:
except py.error.EEXIST: except py.error.EEXIST:
continue continue
break break
# we need to create another subdir self.tmpdir = tmpdir
# because Directory.collect() currently loads
# conftest.py from sibling directories
self.tmpdir = tmpdir.mkdir(name)
self.plugins = [] self.plugins = []
self._syspathremove = [] self._syspathremove = []
self.chdir() # always chdir self.chdir() # always chdir
@ -422,7 +419,8 @@ class TmpTestdir:
str(os.getcwd()), env.get('PYTHONPATH', '')])) str(os.getcwd()), env.get('PYTHONPATH', '')]))
kw['env'] = env kw['env'] = env
#print "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): def pytestmain(self, *args, **kwargs):
class ResetCapturing: class ResetCapturing: