From 1e390b9a8692ca40c006741ab786694936ae92d2 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Mon, 30 Apr 2018 11:28:25 +0100
Subject: [PATCH] Fix issue with callfsl unit tests, causing other tests to
fail.
---
fsl/utils/parse_data.py | 3 ---
tests/test_callfsl.py | 11 ++++++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/fsl/utils/parse_data.py b/fsl/utils/parse_data.py
index 00826db24..20e51d752 100644
--- a/fsl/utils/parse_data.py
+++ b/fsl/utils/parse_data.py
@@ -80,6 +80,3 @@ def Atlas(name):
atlas_names = tuple(desc.atlasID for desc in atlases.listAtlases())
raise argparse.ArgumentTypeError('Requested atlas %r not one of: %r' % (name, atlas_names))
return atlases.loadAtlas(name)
-
-
-
diff --git a/tests/test_callfsl.py b/tests/test_callfsl.py
index 25c156f87..25c972e38 100644
--- a/tests/test_callfsl.py
+++ b/tests/test_callfsl.py
@@ -75,6 +75,11 @@ def test_callfsl():
with mock.patch('fsl.utils.callfsl.sp.check_output',
mock_check_output):
callfsl.callFSL(cmd)
- fslplatform.fsldir = None
- with pytest.raises(Exception):
- callfsl.callFSL(cmd)
+
+ try:
+ oldval = fslplatform.fsldir
+ fslplatform.fsldir = None
+ with pytest.raises(Exception):
+ callfsl.callFSL(cmd)
+ finally:
+ fslplatform.fsldir = oldval
--
GitLab