Merge from trunk

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index 8a4644a..49bbfaa 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -333,7 +333,7 @@ def run(module=None, report=True):
     stdtracks()
     try:
         module.test()
-    except:
+    except Exception, e:
         traceback.print_exc(None, sys.stderr)
         failures += 1
     stop_daemon()