Fixed tests.

Author: chrisgorgo

nipype/interfaces/fsl/__init__.py

@@ -16,7 +16,7 @@
                     ImageStats, FilterRegressor, Overlay, Slicer,
                     PlotTimeSeries, PlotMotionParams, ConvertXFM,
                     SwapDimensions, PowerSpectrum, SigLoss, Reorient2Std,
-                    Complex)
+                    Complex, InvWarp)
 from .dti import (EddyCorrect, BEDPOSTX, DTIFit, ProbTrackX, VecReg, ProjThresh,
                   FindTheBiggest, DistanceMap, TractSkeleton, XFibres,
                   MakeDyadicVectors)

nipype/interfaces/fsl/tests/test_utils.py

@@ -414,10 +414,8 @@ def test_swapdims():
 def test_invwarp():
     input_map = dict(environ=dict(),
                      args=dict(argstr='%s',),
-                     environ=dict(),
                      warp=dict(mandatory=True,),
-                     reference=dict(mandatory=True,),
-                     inverse_warp=dict(mandatory=True,))
+                     reference=dict(mandatory=True,))
     instance = fsl.InvWarp()
     for key, metadata in input_map.items():
         for metakey, value in metadata.items():

nipype/interfaces/fsl/utils.py

@@ -1220,9 +1220,7 @@ def _list_outputs(self):
                                                   basename='maskexf')
         return outputs
 
-<<<<<<< HEAD
 
-=======
 class SigLossInputSpec(FSLCommandInputSpec):
     in_file = File(mandatory=True,
                    exists=True,
@@ -1271,7 +1269,7 @@ def _gen_filename(self, name):
             return self._list_outputs()['out_file']
         return None
 
->>>>>>> master
+
 class Reorient2StdInputSpec(FSLCommandInputSpec):
     in_file = File(exists=True, mandatory=True, argstr="%s")
     out_file = File(genfile=True, hash_files=False, argstr="%s")
@@ -1355,7 +1353,8 @@ class InvWarp(FSLCommand):
     """Use FSL Invwarp to inverse a FNIRT warp
 
     Examples
-    >>> invwarp = Invwarp()
+    >>> from nipype.interfaces.fsl import InvWarp
+    >>> invwarp = InvWarp()
     >>> invwarp.inputs.warp = "struct2mni.nii"
     >>> invwarp.inputs.reference = "anatomical.nii"
     >>> invwarp.inputs.inverse_warp = "mni2t1.nii"