From 4692cf6ac0e5b47b7d2f61bd147cfb29bae25df2 Mon Sep 17 00:00:00 2001
Message-Id: <4692cf6ac0e5b47b7d2f61bd147cfb29bae25df2.1715615840.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 7 Mar 2010 15:20:46 +0000
Subject: [PATCH] More reliably shut down daemon when test fails or is skipped.
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 tests/dtest.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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"
-- 
[mdw]