From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 7 Mar 2010 15:20:46 +0000 (+0000)
Subject: More reliably shut down daemon when test fails or is skipped.
X-Git-Tag: 5.0~9
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/4692cf6ac0e5b47b7d2f61bd147cfb29bae25df2

More reliably shut down daemon when test fails or is skipped.
---

diff --git a/tests/dtest.py b/tests/dtest.py
index f17cf8e..ec42e70 100644
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -337,7 +337,8 @@ def run(module=None, report=True):
     except Exception, e:
         traceback.print_exc(None, sys.stderr)
         failures += 1
-    stop_daemon()
+    finally:
+        stop_daemon()
     if report:
         if failures:
             print " FAILED"