REF: Deduplicate no_freesurfer

Author: effigies

nipype/interfaces/freesurfer/tests/test_preprocess.py

@@ -5,18 +5,10 @@
 import nibabel as nif
 import numpy as np
 from tempfile import mkdtemp
-from nipype.testing import (assert_equal, assert_false, assert_true,
-                            assert_raises, skipif)
+from nipype.testing import assert_equal, assert_raises, skipif
 import nipype.interfaces.freesurfer as freesurfer
 
 
-def no_freesurfer():
-    if freesurfer.Info().version is None:
-        return True
-    else:
-        return False
-
-
 def create_files_in_directory():
     outdir = os.path.realpath(mkdtemp())
     cwd = os.getcwd()
@@ -38,7 +30,7 @@ def clean_directory(outdir, old_wd):
     os.chdir(old_wd)
 
 
-@skipif(no_freesurfer)
+@skipif(freesurfer.no_freesurfer)
 def test_robustregister():
     filelist, outdir, cwd = create_files_in_directory()
 
@@ -66,7 +58,7 @@ def test_robustregister():
     clean_directory(outdir, cwd)
 
 
-@skipif(no_freesurfer)
+@skipif(freesurfer.no_freesurfer)
 def test_fitmsparams():
     filelist, outdir, cwd = create_files_in_directory()
 
@@ -91,7 +83,7 @@ def test_fitmsparams():
     clean_directory(outdir, cwd)
 
 
-@skipif(no_freesurfer)
+@skipif(freesurfer.no_freesurfer)
 def test_synthesizeflash():
     filelist, outdir, cwd = create_files_in_directory()
 

nipype/interfaces/freesurfer/tests/test_utils.py

@@ -15,13 +15,6 @@
 import nipype.interfaces.freesurfer as fs
 
 
-def no_freesurfer():
-    if fs.Info().version is None:
-        return True
-    else:
-        return False
-
-
 def create_files_in_directory():
     outdir = os.path.realpath(mkdtemp())
     cwd = os.getcwd()
@@ -60,7 +53,7 @@ def clean_directory(outdir, old_wd):
     os.chdir(old_wd)
 
 
-@skipif(no_freesurfer)
+@skipif(fs.no_freesurfer)
 def test_sample2surf():
 
     s2s = fs.SampleToSurface()
@@ -104,7 +97,7 @@ def set_illegal_range():
     clean_directory(cwd, oldwd)
 
 
-@skipif(no_freesurfer)
+@skipif(fs.no_freesurfer)
 def test_surfsmooth():
 
     smooth = fs.SurfaceSmooth()
@@ -139,7 +132,7 @@ def test_surfsmooth():
     clean_directory(cwd, oldwd)
 
 
-@skipif(no_freesurfer)
+@skipif(fs.no_freesurfer)
 def test_surfxfm():
 
     xfm = fs.SurfaceTransform()
@@ -173,7 +166,7 @@ def test_surfxfm():
     clean_directory(cwd, oldwd)
 
 
-@skipif(no_freesurfer)
+@skipif(fs.no_freesurfer)
 def test_surfshots():
 
     fotos = fs.SurfaceSnapshots()