simplified test construct

Author: satra

nipype/pipeline/engine/nodes.py

@@ -1128,11 +1128,8 @@ def _node_runner(self, nodes, updatehash=False):
             err = None
             try:
                 node.run(updatehash=updatehash)
-            except Exception as e:
-                if sys.version < 3:
-                    err = e
-                else:
-                    err = str(e)
+            except Exception as this_err:
+                err = this_err
                 if str2bool(self.config['execution']['stop_on_first_crash']):
                     raise
             finally:

nipype/pipeline/engine/tests/test_utils.py

@@ -9,6 +9,7 @@
 import os
 from copy import deepcopy
 from shutil import rmtree
+import pytest
 
 from ... import engine as pe
 from ....interfaces import base as nib
@@ -352,13 +353,8 @@ def myfunction(string):
     node.config = deepcopy(config._sections)
     node.config['execution']['stop_on_first_crash'] = True
     node.base_dir = str(tmpdir)
-
-    error_raised = False
-    try:
+    with pytest.raises(TypeError):
         node.run()
-    except TypeError as e:
-        error_raised = True
-    assert error_raised
 
 
 def test_mapnode_crash2(tmpdir):
@@ -374,12 +370,8 @@ def myfunction(string):
     node.inputs.WRONG = ['string' + str(i) for i in range(3)]
     node.base_dir = str(tmpdir)
 
-    error_raised = False
-    try:
+    with pytest.raises(Exception):
         node.run()
-    except Exception as e:
-        error_raised = True
-    assert error_raised
 
 
 def test_mapnode_crash3(tmpdir):
@@ -395,13 +387,7 @@ def myfunction(string):
 
     node.inputs.WRONG = ['string' + str(i) for i in range(3)]
     wf = pe.Workflow('testmapnodecrash')
-    wf.config['crashdump_dir'] = str(tmpdir)
     wf.add_nodes([node])
     wf.base_dir = str(tmpdir)
-
-    error_raised = False
-    try:
-        wf.run()
-    except RuntimeError as e:
-        error_raised = True
-    assert error_raised
+    with pytest.raises(RuntimeError):
+        wf.run(plugin='Linear')