fix: clean up fsl model tests.

Author: satra

nipype/interfaces/fsl/model.py

@@ -1472,12 +1472,9 @@ class Randomise(FSLCommand):
     Example
     -------
     >>> import nipype.interfaces.fsl as fsl
-    >>> rand = fsl.Randomise(in_file='allFA.nii', \
-    mask = 'mask.nii', \
-    tcon='design.con', \
-    design_mat='design.mat')
+    >>> rand = fsl.Randomise(in_file='allFA.nii', mask = 'mask.nii', tcon='design.con', design_mat='design.mat')
     >>> rand.cmdline
-    'randomise -i allFA.nii -o tbss_ -d design.mat -t design.con -m mask.nii'
+    'randomise -i allFA.nii -o "tbss_" -d design.mat -t design.con -m mask.nii'
 
     """
 
@@ -1536,20 +1533,25 @@ class GLMInputSpec(FSLCommandInputSpec):
     options = traits.String(
         argstr='%s',
         desc = 'fsl_glm options')
+
+
 class GLMOutputSpec(TraitedSpec):
     out_file = File(
         exists=True,
         desc = 'file or image output')
 
+
 class GLM(FSLCommand):
     """
     FSL GLM: 
 
     Example
     -------
     >>> import nipype.interfaces.fsl as fsl
-    >>> glm = fsl.GLM(in_file='functional.nii', design = 'maps.nii')
+    >>> glm = fsl.GLM(in_file='functional.nii', design='maps.nii')
     >>> glm.cmdline
+    'fsl_glm -d maps.nii -i functional.nii -o functional_glm.txt'
+
     """
     _cmd = 'fsl_glm'
     input_spec = GLMInputSpec
@@ -1560,17 +1562,12 @@ def _list_outputs(self):
         outputs['out_file'] = self.inputs.out_file
         # Generate an out_file if one is not provided
         if not isdefined(outputs['out_file']) and isdefined(self.inputs.in_file):
-            ext = Info.output_type_to_ext(self.inputs.output_type)
-            if split_filename(self.inputs.in_file)[-1] in Info.ftypes.values():
-                ext = '.txt'
-            outputs['out_file'] = self._gen_fname(self.inputs.in_file,
-                                                  suffix='_glm',
-                                                  ext=ext)
-
+            outputs['out_file'] = os.path.abspath(self._gen_filename('out_file'))
         return outputs
 
     def _gen_filename(self, name):
         if name in ('out_file'):
-            return self._list_outputs()[name]
-        else:
-            return None
+            from nipype.utils.filemanip import fname_presuffix
+            return fname_presuffix(self.inputs.in_file,
+                                   suffix='_glm.txt', use_ext=False)
+        return None