From e8bab97e42a90980bc85e4f82013ea5645feacd0 Mon Sep 17 00:00:00 2001 From: Tom Scogland Date: Tue, 1 Sep 2015 14:04:21 -0700 Subject: [PATCH] python/test: update to new tmpdir scheme FLUX_TMPDIR has been removed, this commit removes references to it from sideflux and repairs behavior of FLUX_URI. --- src/bindings/python/test_commands/sideflux.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/bindings/python/test_commands/sideflux.py b/src/bindings/python/test_commands/sideflux.py index 364635205b8c..d5d2087f2442 100644 --- a/src/bindings/python/test_commands/sideflux.py +++ b/src/bindings/python/test_commands/sideflux.py @@ -45,18 +45,15 @@ def __init__(self, size=1): global flux_exe self.size = size self.tmpdir = tempfile.mkdtemp(prefix='flux-sandbox-') - self.flux_tmpdir = os.path.join(self.tmpdir, 'flux-sideflux-0') - self.flux_uri = 'local://' + self.flux_tmpdir - os.makedirs(self.flux_tmpdir) + self.flux_uri = 'local://' + self.tmpdir + '/0' self.cleaned = False def start(self): flux_command = [flux_exe, 'start', '--size={}'.format(self.size), '-o', - '-L,stderr,--sid,sideflux', 'bash'] + '-L,stderr,--socket-directory,' + self.tmpdir , 'bash'] # print ' '.join(flux_command) FNULL = open(os.devnull, 'w+') self.subenv = os.environ.copy() - self.subenv.pop('FLUX_TMPDIR', None) self.subenv.pop('FLUX_URI', None) self.subenv['TMPDIR'] = self.tmpdir self.sub = subprocess.Popen( @@ -72,7 +69,6 @@ def start(self): print('echo READY', file=self.sub.stdin) self.env_items = {} - # self.env_items['FLUX_TMPDIR'] = self.flux_tmpdir self.env_items['FLUX_URI'] = self.flux_uri while True: