Catch SIGINT/Exit during rollbacks

Closes #133

Signed-off-by: Sylvain Hellegouarch <sh@defuze.org>

Author: Lawouach

CHANGELOG.md

@@ -7,9 +7,12 @@
 ### Added
 
 - Catch `InterruptExecution` during rollbacks so that the experiment terminates
-  gracefully [#132][132]
+  gracefully [#132][132].  The remaining rollbacks are not applied.
+- Catch `SIGINT` and `SystemExit` during rollbacks so that the experiment
+  terminates gracefully [#133][133]. The remaining rollbacks are not applied.
 
 [132]: https://github.com/chaostoolkit/chaostoolkit-lib/issues/132
+[133]: https://github.com/chaostoolkit/chaostoolkit-lib/issues/133
 
 ## [1.7.0][] - 2019-09-21
 

chaoslib/experiment.py

@@ -254,6 +254,11 @@ def run_experiment(experiment: Experiment,
             except InterruptExecution as i:
                 journal["status"] = "interrupted"
                 logger.fatal(str(i))
+            except (KeyboardInterrupt, SystemExit):
+                journal["status"] = "interrupted"
+                logger.warn(
+                    "Received an exit signal."
+                    "Terminating now without running the remaining rollbacks.")
 
         journal["end"] = datetime.utcnow().isoformat()
         journal["duration"] = time.time() - started_at

tests/test_experiment.py

@@ -187,6 +187,36 @@ def handler(signum, frame):
         pytest.fail("we should have swalled the InterruptExecution exception")
 
 
+def test_can_interrupt_rollbacks_on_SystemExit():
+    def handler(signum, frame):
+        raise SystemExit()
+
+    signal.signal(signal.SIGALRM, handler)
+    signal.alarm(1)
+
+    try:
+        journal = run_experiment(experiments.ExperimentWithRollbackLongPause)
+        assert isinstance(journal, dict)
+        assert journal["status"] == "interrupted"
+    except SystemExit:
+        pytest.fail("we should have swalled the SystemExit exception")
+
+
+def test_can_interrupt_rollbacks_on_SIGINT():
+    def handler(signum, frame):
+        raise KeyboardInterrupt()
+
+    signal.signal(signal.SIGALRM, handler)
+    signal.alarm(1)
+
+    try:
+        journal = run_experiment(experiments.ExperimentWithRollbackLongPause)
+        assert isinstance(journal, dict)
+        assert journal["status"] == "interrupted"
+    except SystemExit:
+        pytest.fail("we should have swalled the KeyboardInterrupt exception")
+
+
 def test_probes_can_reference_each_other():
     experiment = experiments.RefProbeExperiment.copy()
     experiment["dry"] = True