# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1333467290 -3600
# Node ID 2d2d93380694ccd98d4e1975769ce0387bb696cf
# Parent  3639efa7216a08a6506eb1d790b6f4e9c7450028# Parent  1745fd2dd308cdb8305731541e00f25b6b614e74
Merge with stable

diff -r 3639efa7216a -r 2d2d93380694 tests/run-tests.py
--- a/tests/run-tests.py	Mon Apr 02 17:28:55 2012 +0100
+++ b/tests/run-tests.py	Tue Apr 03 16:34:50 2012 +0100
@@ -75,7 +75,7 @@
         def t():
             start = time.time()
             while time.time() - start < timeout and p.returncode is None:
-                time.sleep(1)
+                time.sleep(.1)
             p.timeout = True
             if p.returncode is None:
                 terminate(p)
@@ -360,7 +360,7 @@
                 os.kill(pid, 0)
                 vlog('# Killing daemon process %d' % pid)
                 os.kill(pid, signal.SIGTERM)
-                time.sleep(0.25)
+                time.sleep(0.1)
                 os.kill(pid, 0)
                 vlog('# Daemon process %d is stuck - really killing it' % pid)
                 os.kill(pid, signal.SIGKILL)
@@ -1275,7 +1275,7 @@
         else:
             runtests(options, tests)
     finally:
-        time.sleep(1)
+        time.sleep(.1)
         cleanup(options)
 
 if __name__ == '__main__':