From b175e90f2637550021cd75947fec29c694a6f393 Mon Sep 17 00:00:00 2001 From: hpk Date: Fri, 9 Feb 2007 00:25:32 +0100 Subject: [PATCH] [svn r38218] i give up for now, somehow the local change in the FileBox affects --dist testing in ways i can't fully understand at the moment (i would think it only affects --boxed test runs). So we are back to share tempdirs when running boxed (causing failures elswhere). We care later, i guess. --HG-- branch : trunk --- py/test/rsession/box.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/py/test/rsession/box.py b/py/test/rsession/box.py index 6719a890f..11ca29ace 100644 --- a/py/test/rsession/box.py +++ b/py/test/rsession/box.py @@ -82,10 +82,13 @@ class FileBox(object): if nice_level: os.nice(nice_level) # with fork() we have duplicated py.test's basetemp - # directory so we set it manually here. + # directory so we want to set it manually here. # this may be expensive for some test setups, # but that is what you get with boxing. - pytestconfig.basetemp = self.tempdir.join("childbasetemp") + # XXX but we are called in more than strict boxing + # mode ("AsyncExecutor") so we can't do the following without + # inflicting on --dist speed, hum: + # pytestconfig.basetemp = self.tempdir.join("childbasetemp") retval = self.fun(*self.args, **self.kwargs) retvalf.write(marshal.dumps(retval)) finally: