TEST: Condition freesurfer test on command installation

Author: effigies

nipype/interfaces/freesurfer/__init__.py

@@ -2,7 +2,7 @@
 # vi: set ft=python sts=4 ts=4 sw=4 et:
 """Top-level namespace for freesurfer."""
 
-from .base import Info, FSCommand
+from .base import Info, FSCommand, no_freesurfer
 from .preprocess import (ParseDICOMDir, UnpackSDICOMDir, MRIConvert, Resample,
                          ReconAll, BBRegister, ApplyVolTransform, Smooth,
                          DICOMConvert, RobustRegister, FitMSParams,

nipype/interfaces/freesurfer/base.py

@@ -117,10 +117,6 @@ def _subjects_dir_update(self):
     def set_default_subjects_dir(cls, subjects_dir):
         cls._subjects_dir = subjects_dir
 
-    @property
-    def version(self):
-        return Info.version()
-
     def run(self, **inputs):
         if 'subjects_dir' in inputs:
             self.inputs.subjects_dir = inputs['subjects_dir']
@@ -220,3 +216,14 @@ def run(self, **inputs):
             self.inputs.num_threads = inputs['num_threads']
         self._num_threads_update()
         return super(FSCommandOpenMP, self).run(**inputs)
+
+
+def no_freesurfer():
+    """Checks if FreeSurfer is NOT installed
+    used with skipif to skip tests that will
+    fail if FreeSurfer is not installed"""
+
+    if Info.version() is None:
+        return True
+    else:
+        return False

nipype/interfaces/freesurfer/tests/test_model.py

@@ -7,10 +7,11 @@
 import numpy as np
 import nibabel as nib
 
-from nipype.testing import assert_equal
-from nipype.interfaces.freesurfer import model
+from nipype.testing import assert_equal, skipif
+from nipype.interfaces.freesurfer import model, no_freesurfer
 
 
+@skipif(no_freesurfer)
 def test_concatenate():
     tmp_dir = tempfile.mkdtemp()
     cwd = os.getcwd()