Fix issue with callfsl unit tests, causing other tests to fail.

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)
-
-
-

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