From ae1c9228670414c60e261cd8ed6b88fea1c561f3 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sat, 24 Oct 2009 17:29:22 +0100 Subject: [PATCH] Finer-grained wait for socket to appear when testing. Organization: Straylight/Edgeware From: Richard Kettlewell --- tests/dtest.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/dtest.py b/tests/dtest.py index 49bbfaa..67b2b8f 100644 --- a/tests/dtest.py +++ b/tests/dtest.py @@ -238,20 +238,23 @@ Start the daemon.""" stderr=errs) # Wait for the socket to be created waited = 0 + sleep_resolution = 0.125 while not os.path.exists(socket): rc = daemon.poll() if rc is not None: print "FATAL: daemon failed to start up" sys.exit(1) - waited += 1 + waited += sleep_resolution + if sleep_resolution < 1: + sleep_resolution *= 2 if waited == 1: print " waiting for socket..." elif waited >= 60: print "FATAL: took too long for socket to appear" sys.exit(1) - time.sleep(1) + time.sleep(sleep_resolution) if waited > 0: - print " took about %ds for socket to appear" % waited + print " took about %ss for socket to appear" % waited # Wait for root user to be created command(["disorder", "--config", disorder._configfile, "--no-per-user-config", -- [mdw]