update specs of the two interfaces affected so far

Author: oesteban

nipype/interfaces/afni/tests/test_auto_OutlierCount.py

@@ -8,11 +8,11 @@ def test_OutlierCount_inputs():
     ),
     autoclip=dict(argstr='-autoclip',
     usedefault=True,
-    xor=['in_file'],
+    xor=['mask'],
     ),
     automask=dict(argstr='-automask',
     usedefault=True,
-    xor=['in_file'],
+    xor=['mask'],
     ),
     environ=dict(nohash=True,
     usedefault=True,
@@ -54,7 +54,8 @@ def test_OutlierCount_inputs():
     ),
     save_outliers=dict(usedefault=True,
     ),
-    terminal_output=dict(nohash=True,
+    terminal_output=dict(deprecated='1.0.0',
+    nohash=True,
     ),
     )
     inputs = OutlierCount.input_spec()

nipype/interfaces/fsl/tests/test_auto_WarpPointsFromStd.py

@@ -1,16 +1,16 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
-from ....testing import assert_equal
+from __future__ import unicode_literals
 from ..utils import WarpPointsFromStd
 
 
 def test_WarpPointsFromStd_inputs():
     input_map = dict(args=dict(argstr='%s',
     ),
     coord_mm=dict(argstr='-mm',
-    xor=[u'coord_vox'],
+    xor=['coord_vox'],
     ),
     coord_vox=dict(argstr='-vox',
-    xor=[u'coord_mm'],
+    xor=['coord_mm'],
     ),
     environ=dict(nohash=True,
     usedefault=True,
@@ -28,20 +28,21 @@ def test_WarpPointsFromStd_inputs():
     std_file=dict(argstr='-std %s',
     mandatory=True,
     ),
-    terminal_output=dict(nohash=True,
+    terminal_output=dict(deprecated='1.0.0',
+    nohash=True,
     ),
     warp_file=dict(argstr='-warp %s',
-    xor=[u'xfm_file'],
+    xor=['xfm_file'],
     ),
     xfm_file=dict(argstr='-xfm %s',
-    xor=[u'warp_file'],
+    xor=['warp_file'],
     ),
     )
     inputs = WarpPointsFromStd.input_spec()
 
     for key, metadata in list(input_map.items()):
         for metakey, value in list(metadata.items()):
-            yield assert_equal, getattr(inputs.traits()[key], metakey), value
+            assert getattr(inputs.traits()[key], metakey) == value
 
 
 def test_WarpPointsFromStd_outputs():
@@ -51,4 +52,4 @@ def test_WarpPointsFromStd_outputs():
 
     for key, metadata in list(output_map.items()):
         for metakey, value in list(metadata.items()):
-            yield assert_equal, getattr(outputs.traits()[key], metakey), value
+            assert getattr(outputs.traits()[key], metakey) == value