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

diff --git a/tests/dtest.py b/tests/dtest.py
index f17cf8e1af5a665f08ddb4cacf885bd53c26f096..ec42e702ff7b1c805291c365bce0e4c8b0643bc0 100644 (file)
--- 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
     except Exception, e:
         traceback.print_exc(None, sys.stderr)
         failures += 1

-    stop_daemon()
+    finally:
+        stop_daemon()

     if report:
         if failures:
             print " FAILED"
     if report:
         if failures:
             print " FAILED"