fixed tests

nipy · oesteban · Nov 25, 2018 · Nov 25, 2018 · Nov 25, 2018 · Nov 25, 2018
commit 1a558a4d0250191afec8f13927810cb863c1f51e
diff --git a/nipype/interfaces/freesurfer/tests/test_preprocess.py b/nipype/interfaces/freesurfer/tests/test_preprocess.py
@@ -11,6 +11,7 @@
 from nipype.interfaces.freesurfer import Info
 from nipype import LooseVersion
 from nipype.utils import errors as nue
+from nipype.utils.tests.test_cmd import capture_sys_output


 @pytest.mark.skipif(
@@ -128,7 +129,7 @@ def test_mandatory_outvol(create_files_in_directory):
    assert mni.cmdline is None
    # test raising error with mandatory args absent
    with pytest.raises(nue.MandatoryInputError):
-        mni.cmdline
+        mni.run()

    # test with minimal args
    mni.inputs.in_file = filelist[0]
@@ -155,19 +156,20 @@ def test_mandatory_outvol(create_files_in_directory):

 @pytest.mark.skipif(
    fs.no_freesurfer(), reason="freesurfer is not installed")
-def test_bbregister(capsys, create_files_in_directory):
+def test_bbregister(create_files_in_directory):
    filelist, outdir = create_files_in_directory
    bbr = fs.BBRegister()

    # make sure command gets called
    assert bbr.cmd == "bbregister"

    # cmdline issues a warning in this stats
-    assert bbr.cmdline is None
-    captured = capsys.readouterr()
+    with capture_sys_output() as (stdout, stderr):
+        assert bbr.cmdline is None

-    assert 'WARNING' in captured.out
-    assert 'Some inputs are not valid.' in captured.out
+    captured = stdout.getvalue()
+    assert 'WARNING' in captured
+    assert 'Command line could not be generated' in captured

    # test raising error with mandatory args absent
    with pytest.raises(nue.MandatoryInputError):
@@ -179,9 +181,10 @@ def test_bbregister(capsys, create_files_in_directory):

    # Check that 'init' is mandatory in FS < 6, but not in 6+
    if Info.looseversion() < LooseVersion("6.0.0"):
-        assert bbr.cmdline is None
-        captured = capsys.readouterr()
-        assert 'Some inputs are not valid.' in captured.out
+        with capture_sys_output() as (stdout, stderr):
+            assert bbr.cmdline is None
+        captured = stdout.getvalue()
+        assert 'Command line could not be generated' in captured

        with pytest.raises(nue.VersionIOError):
            bbr.run()