fix: rebase arg not honored + improved tests (add xfail mark for python 2)

Author: oesteban

nipype/pipeline/engine/tests/test_utils.py

@@ -17,7 +17,7 @@
 from ....interfaces import utility as niu
 from .... import config
 from ..utils import (clean_working_directory, write_workflow_prov,
-                     save_resultfile, load_resultfile)
+                     load_resultfile)
 
 
 class InputSpec(nib.TraitedSpec):
@@ -286,13 +286,20 @@ def test_modify_paths_bug(tmpdir):
     assert outputs.out_list == [out_str] * 2
 
 
-def test_save_load_resultfile(tmpdir):
+@pytest.mark.xfail(sys.version_info < (3, 4),
+                   reason="rebase does not fully work with Python 2.7")
+@pytest.mark.parametrize("use_relative", [True, False])
+def test_save_load_resultfile(tmpdir, use_relative):
     """Test minimally the save/load functions for result files."""
-    from shutil import copytree
+    from shutil import copytree, rmtree
     tmpdir.chdir()
 
+    old_use_relative = config.getboolean('execution', 'use_relative_paths')
+    config.set('execution', 'use_relative_paths', use_relative)
+
     spc = pe.Node(StrPathConfuser(in_str='2'), name='spc')
     spc.base_dir = tmpdir.mkdir('node').strpath
+
     result = spc.run()
 
     loaded_result = load_resultfile(
@@ -304,14 +311,22 @@ def test_save_load_resultfile(tmpdir):
 
     # Test the mobility of the result file.
     copytree(tmpdir.join('node').strpath, tmpdir.join('node2').strpath)
-    save_resultfile(result, tmpdir.join('node2').strpath, 'spc', rebase=True)
-    loaded_result2 = load_resultfile(
-        tmpdir.join('node2').join('spc').join('result_spc.pklz').strpath)
-
-    assert result.runtime.dictcopy() == loaded_result2.runtime.dictcopy()
-    assert result.inputs == loaded_result2.inputs
-    assert loaded_result2.outputs.get() != result.outputs.get()
-    newpath = result.outputs.out_path.replace('/node/', '/node2/')
-    assert loaded_result2.outputs.out_path == newpath
-    assert loaded_result2.outputs.out_tuple[0] == newpath
-    assert loaded_result2.outputs.out_dict_path['2'] == newpath
+    rmtree(tmpdir.join('node').strpath)
+
+    if use_relative:
+        loaded_result2 = load_resultfile(
+            tmpdir.join('node2').join('spc').join('result_spc.pklz').strpath)
+
+        assert result.runtime.dictcopy() == loaded_result2.runtime.dictcopy()
+        assert result.inputs == loaded_result2.inputs
+        assert loaded_result2.outputs.get() != result.outputs.get()
+        newpath = result.outputs.out_path.replace('/node/', '/node2/')
+        assert loaded_result2.outputs.out_path == newpath
+        assert loaded_result2.outputs.out_tuple[0] == newpath
+        assert loaded_result2.outputs.out_dict_path['2'] == newpath
+    else:
+        with pytest.raises(nib.TraitError):
+            load_resultfile(
+                tmpdir.join('node2').join('spc').join('result_spc.pklz').strpath)
+
+    config.set('execution', 'use_relative_paths', old_use_relative)

nipype/pipeline/engine/utils.py

@@ -250,6 +250,10 @@ def save_resultfile(result, cwd, name, rebase=None):
         savepkl(resultsfile, result)
         return
 
+    if not rebase:
+        savepkl(resultsfile, result)
+        return
+
     backup_traits = {}
     try:
         with indirectory(cwd):

nipype/utils/filemanip.py

@@ -708,7 +708,7 @@ def loadpkl(infile):
 Attempted to open a results file generated by Nipype version %s, \
 with an incompatible Nipype version (%s)""", pkl_metadata['version'], version)
                     raise e
-            fmlogger.error("""\
+            fmlogger.warning("""\
 No metadata was found in the pkl file. Make sure you are currently using \
 the same Nipype version from the generated pkl.""")
             raise e