Fix tests (do not re-intercept re-raised exceptions)

cta-observatory · Jun 20, 2024 · 636d451 · 636d451
1 parent 8fef3fd
commit 636d451
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/ctapipe/core/tool.py b/src/ctapipe/core/tool.py
@@ -452,13 +452,18 @@ def run(self, argv=None, raises=False):
                 if raises:
                     raise
             except SystemExit as err:
-                exit_status = err.code
-                self.log.exception("Caught SystemExit with exit code %s", exit_status)
-                Provenance().finish_activity(
-                    activity_name=self.name,
-                    status="partial_success",
-                    exit_code=exit_status,
-                )
+                if raises:
+                    raise  # do not re-intercept in tests
+                else:
+                    exit_status = err.code
+                    self.log.exception(
+                        "Caught SystemExit with exit code %s", exit_status
+                    )
+                    Provenance().finish_activity(
+                        activity_name=self.name,
+                        status="partial_success",
+                        exit_code=exit_status,
+                    )
             finally:
                 if not {"-h", "--help", "--help-all"}.intersection(self.argv):
                     self.write_provenance()