fixed regression tests

Author: oesteban

nipype/interfaces/tests/test_base.py

@@ -227,14 +227,12 @@ class TestName(nib.CommandLine):
     teardown_file(tmpd)
 
 
-def test_cycle_namesource():
+def test_cycle_namesource1():
     tmp_infile = setup_file()
     tmpd, nme, ext = split_filename(tmp_infile)
     pwd = os.getcwd()
     os.chdir(tmpd)
 
-    from unittest import TestCase
-
     class spec3(nib.CommandLineInputSpec):
         moo = nib.File(name_source=['doo'], hash_files=False, argstr="%s",
                        position=1, name_template='%s_mootpl')
@@ -247,19 +245,51 @@ class TestCycle(nib.CommandLine):
         _cmd = "mycommand"
         input_spec = spec3
 
-        def get_cmd(self):
-            return self.cmdline
-
     # Check that an exception is raised
     to0 = TestCycle()
-    yield assert_raises, nib.NipypeInterfaceError, to0.get_cmd
+    not_raised = True
+    try:
+        to0.cmdline
+    except nib.NipypeInterfaceError:
+        not_raised = False
+    yield assert_false, not_raised
+
+    os.chdir(pwd)
+    teardown_file(tmpd)
+
+def test_cycle_namesource2():
+    tmp_infile = setup_file()
+    tmpd, nme, ext = split_filename(tmp_infile)
+    pwd = os.getcwd()
+    os.chdir(tmpd)
+
+
+    class spec3(nib.CommandLineInputSpec):
+        moo = nib.File(name_source=['doo'], hash_files=False, argstr="%s",
+                       position=1, name_template='%s_mootpl')
+        poo = nib.File(name_source=['moo'], hash_files=False,
+                       argstr="%s", position=2)
+        doo = nib.File(name_source=['poo'], hash_files=False,
+                       argstr="%s", position=3)
+
+    class TestCycle(nib.CommandLine):
+        _cmd = "mycommand"
+        input_spec = spec3
 
     # Check that loop can be broken by setting one of the inputs
     to1 = TestCycle()
     to1.inputs.poo = tmp_infile
-    res = to1.cmdline
+
+    not_raised = True
+    try:
+        res = to1.cmdline
+    except nib.NipypeInterfaceError:
+        not_raised = False
+    print res
+
+    yield assert_true, not_raised
     yield assert_true, '%s' % tmp_infile in res
-    yield assert_true, '%s_generated ' % nme in res
+    yield assert_true, '%s_generated' % nme in res
     yield assert_true, '%s_generated_mootpl' % nme in res
 
     os.chdir(pwd)