TEST: Update in_testing fixture

Author: effigies

nipype/conftest.py

@@ -2,22 +2,20 @@
 import numpy
 import os
 
+DATADIR = os.path.realpath(
+    os.path.join(os.path.dirname(__file__), 'testing/data'))
+
 
 @pytest.fixture(autouse=True)
 def add_np(doctest_namespace):
     doctest_namespace['np'] = numpy
     doctest_namespace['os'] = os
 
-    filepath = os.path.dirname(os.path.realpath(__file__))
-    datadir = os.path.realpath(os.path.join(filepath, 'testing/data'))
-    doctest_namespace["datadir"] = datadir
+    doctest_namespace["datadir"] = DATADIR
 
 
-@pytest.fixture(scope='session', autouse=True)
-def in_testing():
-    datadir = os.path.realpath(
-        os.path.join(os.path.dirname(__file__), 'testing/data'))
-    origdir = os.getcwd()
-    os.chdir(datadir)
-    yield
-    os.chdir(origdir)
+@pytest.fixture(autouse=True)
+def in_testing(request):
+    # This seems to be a reliable way to distinguish tests from doctests
+    if request.function is None:
+        os.chdir(DATADIR)