fix tests

Author: oesteban

nipype/interfaces/base/tests/test_core.py

@@ -66,6 +66,8 @@ def __init__(self):
 
 
 def test_BaseInterface():
+    config.set('monitoring', 'enable', '0')
+
     assert nib.BaseInterface.help() is None
     assert nib.BaseInterface._get_filecopy_info() == []
 
@@ -82,6 +84,7 @@ class OutputSpec(nib.TraitedSpec):
 
     class DerivedInterface(nib.BaseInterface):
         input_spec = InputSpec
+        resource_monitor = False
 
     assert DerivedInterface.help() is None
     assert 'moo' in ''.join(DerivedInterface._inputs_help())
@@ -252,6 +255,8 @@ class DerivedInterface1(nib.BaseInterface):
         input_spec = InputSpec
         output_spec = OutputSpec
         _version = '0.10'
+        resource_monitor = False
+
     obj = DerivedInterface1()
     assert obj._check_version_requirements(obj._outputs()) == []
 
@@ -265,6 +270,8 @@ class DerivedInterface1(nib.BaseInterface):
         input_spec = InputSpec
         output_spec = OutputSpec
         _version = '0.10'
+        resource_monitor = False
+
     obj = DerivedInterface1()
     assert obj._check_version_requirements(obj._outputs()) == ['foo']
 
@@ -278,6 +285,7 @@ class DerivedInterface1(nib.BaseInterface):
         input_spec = InputSpec
         output_spec = OutputSpec
         _version = '0.10'
+        resource_monitor = False
 
         def _run_interface(self, runtime):
             return runtime
@@ -298,6 +306,7 @@ def test_Commandline():
     ci2 = nib.CommandLine(command='which', args='ls')
     assert ci2.cmdline == 'which ls'
     ci3 = nib.CommandLine(command='echo')
+    ci3.resource_monitor = False
     ci3.inputs.environ = {'MYENV': 'foo'}
     res = ci3.run()
     assert res.runtime.environ['MYENV'] == 'foo'
@@ -312,6 +321,7 @@ class CommandLineInputSpec1(nib.CommandLineInputSpec):
         noo = nib.traits.Int(argstr='-x %d', desc='an int')
         roo = nib.traits.Str(desc='not on command line')
         soo = nib.traits.Bool(argstr="-soo")
+
     nib.CommandLine.input_spec = CommandLineInputSpec1
     ci4 = nib.CommandLine(command='cmd')
     ci4.inputs.foo = 'foo'

nipype/interfaces/base/tests/test_support.py

@@ -6,6 +6,7 @@
 import pytest
 from builtins import open
 from future import standard_library
+from pkg_resources import resource_filename as pkgrf
 
 from ....utils.filemanip import md5
 from ... import base as nib
@@ -49,8 +50,9 @@ def test_bunch_methods():
 def test_bunch_hash():
     # NOTE: Since the path to the json file is included in the Bunch,
     # the hash will be unique to each machine.
-    pth = os.path.split(os.path.abspath(__file__))[0]
-    json_pth = os.path.join(pth, 'realign_json.json')
+    json_pth = pkgrf(
+        'nipype', os.path.join('testing', 'data', 'realign_json.json'))
+
     b = nib.Bunch(infile=json_pth,
                   otherthing='blue',
                   yat=True)

nipype/interfaces/tests/realign_json.json nipype/testing/data/realign_json.jsonnipype/interfaces/tests/realign_json.json renamed to nipype/testing/data/realign_json.json

@@ -103,11 +103,11 @@ def main():
         pjoin('testing', 'data', 'brukerdir', 'fid'),
         pjoin('testing', 'data', 'brukerdir', 'pdata', '1', '*'),
         pjoin('testing', 'data', 'ds005', '*'),
+        pjoin('testing', 'data', 'realign_json.json'),
         pjoin('workflows', 'data', '*'),
         pjoin('pipeline', 'engine', 'report_template.html'),
         pjoin('external', 'd3.js'),
         pjoin('interfaces', 'fsl', 'model_templates', '*'),
-        pjoin('interfaces', 'tests', 'realign_json.json'),
         pjoin('interfaces', 'tests', 'use_resources'),
         'pytest.ini',
         'conftest.py',