From 5d8427607046f20b5f6ab867bc10c4fc9ef4b756 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Mon, 28 May 2018 17:03:28 +0100
Subject: [PATCH] TEST: mockFSLDIR helper function clobbers fsldevdir
---
tests/__init__.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tests/__init__.py b/tests/__init__.py
index 349b248a3..d86470892 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -36,7 +36,8 @@ logging.getLogger().setLevel(logging.WARNING)
@contextlib.contextmanager
def mockFSLDIR():
- oldval = fslplatform.fsldir
+ oldfsldir = fslplatform.fsldir
+ oldfsldevdir = fslplatform.fsldevdir
try:
with tempdir() as td:
@@ -44,13 +45,15 @@ def mockFSLDIR():
bindir = op.join(fsldir, 'bin')
os.makedirs(bindir)
fslplatform.fsldir = fsldir
+ fslplatform.fsldevdir = None
path = op.pathsep.join((bindir, os.environ['PATH']))
with mock.patch.dict(os.environ, {'PATH': path}):
yield fsldir
finally:
- fslplatform.fsldir = oldval
+ fslplatform.fsldir = oldfsldir
+ fslplatform.fsldevdir = oldfsldevdir
def touch(fname):
--
GitLab