Merge pull request #3193 from effigies/test/mock_terminal_output

TEST: Mock terminal output before testing changing default value

Author: effigies

nipype/interfaces/base/tests/test_core.py

@@ -5,6 +5,7 @@
 import simplejson as json
 
 import pytest
+from unittest import mock
 
 from .... import config
 from ....testing import example_data
@@ -456,17 +457,18 @@ def test_global_CommandLine_output(tmpdir):
     ci = BET()
     assert ci.terminal_output == "stream"  # default case
 
-    nib.CommandLine.set_default_terminal_output("allatonce")
-    ci = nib.CommandLine(command="ls -l")
-    assert ci.terminal_output == "allatonce"
+    with mock.patch.object(nib.CommandLine, '_terminal_output'):
+        nib.CommandLine.set_default_terminal_output("allatonce")
+        ci = nib.CommandLine(command="ls -l")
+        assert ci.terminal_output == "allatonce"
 
-    nib.CommandLine.set_default_terminal_output("file")
-    ci = nib.CommandLine(command="ls -l")
-    assert ci.terminal_output == "file"
+        nib.CommandLine.set_default_terminal_output("file")
+        ci = nib.CommandLine(command="ls -l")
+        assert ci.terminal_output == "file"
 
-    # Check default affects derived interfaces
-    ci = BET()
-    assert ci.terminal_output == "file"
+        # Check default affects derived interfaces
+        ci = BET()
+        assert ci.terminal_output == "file"
 
 
 def test_CommandLine_prefix(tmpdir):

nipype/interfaces/tests/test_extra_dcm2nii.py

@@ -22,7 +22,7 @@ def _fetch_data(datadir, dicoms):
             """Fetches some test DICOMs using datalad"""
             api.install(path=datadir, source=DICOM_DIR)
             data = os.path.join(datadir, dicoms)
-            api.get(path=data)
+            api.get(path=data, dataset=datadir)
         except IncompleteResultsError as exc:
             pytest.skip("Failed to fetch test data: %s" % str(exc))
         return data
@@ -32,7 +32,6 @@ def _fetch_data(datadir, dicoms):
 
 @pytest.mark.skipif(no_datalad, reason="Datalad required")
 @pytest.mark.skipif(no_dcm2niix, reason="Dcm2niix required")
-@pytest.mark.xfail(reason="Intermittent failures. Let's come back to this later.")
 def test_dcm2niix_dti(fetch_data, tmpdir):
     tmpdir.chdir()
     datadir = tmpdir.mkdir("data").strpath