reinstated exception catching in submitter

Author: tclose

docker-scripts-for-tests/run-docker-slurm-test.sh

@@ -5,4 +5,4 @@ else
 fi
 
 
-docker exec slurm bash -c "pytest /pydra/$TEST --color=yes -vs -k 'not test_audit_prov and not test_audit_prov_messdir_1 and not test_audit_prov_messdir_2 and not test_audit_prov_wf and not test_audit_all'"
+docker exec slurm bash -c "pytest -vv /pydra/$TEST --color=yes -vs -k 'not test_audit_prov and not test_audit_prov_messdir_1 and not test_audit_prov_messdir_2 and not test_audit_prov_wf and not test_audit_all' $2"

pydra/engine/submitter.py

@@ -258,24 +258,24 @@ def Split(
             environment=environment,
             hooks=hooks,
         )
-        # try:
-        self.run_start_time = datetime.now()
-        if self.worker.is_async:  # Only workflow tasks can be async
-            self.loop.run_until_complete(self.worker.run_async(task, rerun=rerun))
-        else:
-            self.worker.run(task, rerun=rerun)
-        # except Exception as e:
-        #     msg = (
-        #         f"Full crash report for {type(task_def).__name__!r} task is here: "
-        #         + str(task.output_dir / "_error.pklz")
-        #     )
-        #     if raise_errors:
-        #         e.add_note(msg)
-        #         raise e
-        #     else:
-        #         logger.error("\nTask execution failed\n%s", msg)
-        # finally:
-        #     self.run_start_time = None
+        try:
+            self.run_start_time = datetime.now()
+            if self.worker.is_async:  # Only workflow tasks can be async
+                self.loop.run_until_complete(self.worker.run_async(task, rerun=rerun))
+            else:
+                self.worker.run(task, rerun=rerun)
+        except Exception as e:
+            msg = (
+                f"Full crash report for {type(task_def).__name__!r} task is here: "
+                + str(task.output_dir / "_error.pklz")
+            )
+            if raise_errors:
+                e.add_note(msg)
+                raise e
+            else:
+                logger.error("\nTask execution failed\n%s", msg)
+        finally:
+            self.run_start_time = None
         PersistentCache().clean_up()
         result = task.result()
         if result is None:

pydra/engine/tests/test_workflow.py

@@ -4463,7 +4463,7 @@ def OuterWf(start_number, task_name, dummy):
     assert res.outputs.res2[0] == 23 and res.outputs.res2[1] == 23
 
 
-def test_rerun_errored(plugin_parallel, tmp_path, capfd):
+def test_rerun_errored(tmp_path, capfd):
     """Test rerunning a workflow containing errors.
     Only the errored tasks and workflow should be rerun"""
 
@@ -4486,11 +4486,11 @@ def WorkyPassOdds(x):
     print("Starting run 1")
     with pytest.raises(RuntimeError):
         # Must be cf to get the error from all tasks, otherwise will only get the first error
-        worky(worker=plugin_parallel, cache_dir=tmp_path)
+        worky(worker="cf", cache_dir=tmp_path)
 
     print("Starting run 2")
     with pytest.raises(RuntimeError):
-        worky(worker=plugin_parallel, cache_dir=tmp_path)
+        worky(worker="cf", cache_dir=tmp_path)
 
     out, err = capfd.readouterr()
     stdout_lines = out.splitlines()