floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn r62997] some more tests, seems like temp test dirs are now more contained when doing distributed testing

Browse Source 
--HG--
branch : trunk
This commit is contained in:
hpk
2009-03-17 13:42:40 +01:00
parent c8d679ac95
commit fc7abf0efe
2 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
py/test/config.py
View File

@@ -120,7 +120,10 @@ class Config(object):
self.args = args
def ensuretemp(self, string, dir=True):
if self.basetemp is None:
return self.getbasetemp().ensure(string, dir=dir)
def getbasetemp(self):
if self.basetemp is None:
basetemp = self.option.basetemp
if basetemp:
basetemp = py.path.local(basetemp)
@@ -128,8 +131,16 @@ class Config(object):
basetemp.mkdir()
else:
basetemp = py.path.local.make_numbered_dir(prefix='pytest-')
self.basetemp = basetemp
return self.basetemp.ensure(string, dir=dir)
self.basetemp = basetemp
return self.basetemp
def mktemp(self, basename, numbered=False):
basetemp = self.getbasetemp()
if not numbered:
return basetemp.mkdir(basename)
else:
return py.path.local.make_numbered_dir(prefix=basename + "-",
keep=0, rootdir=basetemp)
def getcolitems(self):
return [self.getfsnode(arg) for arg in self.args]
@@ -215,6 +226,7 @@ class Config(object):
oldconfig = py.test.config
try:
config_per_process = py.test.config = Config()
config_per_process.basetemp = self.mktemp("reparse", numbered=True)
config_per_process.parse(args)
return config_per_process
finally: