Merge pull request #1497 from shoshber/ubuntutest

TST little testing adjustments

Author: satra

nipype/__init__.py

@@ -55,26 +55,10 @@ def test(self, label='fast', verbose=1, extra_argv=['--exe'],
     test = _NoseTester().test
 del nosetester
 
-
-def _test_local_install():
-    """ Warn the user that running with nipy being
-        imported locally is a bad idea.
-    """
-    if os.getcwd() == os.sep.join(
-            os.path.abspath(__file__).split(os.sep)[:-2]):
-        import warnings
-        warnings.warn('Running the tests from the install directory may '
-                      'trigger some failures')
-
-_test_local_install()
-
 # Set up package information function
 from .pkg_info import get_pkg_info as _get_pkg_info
 get_info = lambda: _get_pkg_info(os.path.dirname(__file__))
 
-# Cleanup namespace
-del _test_local_install
-
 # If this file is exec after being imported, the following lines will
 # fail
 try:

nipype/interfaces/io.py

@@ -2458,8 +2458,8 @@ class JSONFileGrabber(IOBase):
     {'param1': 'overrideMe', 'param3': 1.0}
     >>> jsonSource.inputs.in_file = 'jsongrabber.txt'
     >>> res = jsonSource.run()
-    >>> pprint.pprint(res.outputs.get())  # doctest: +NORMALIZE_WHITESPACE
-    {'param1': 'exampleStr', 'param2': 4, 'param3': 1.0}
+    >>> pprint.pprint(res.outputs.get())  # doctest: +NORMALIZE_WHITESPACE, +ELLIPSIS
+    {'param1': ...'exampleStr', 'param2': 4, 'param3': 1.0}
 
 
     """