chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finer-grained wait for socket to appear when testing.
[disorder]
/
tests
/
dtest.py
diff --git
a/tests/dtest.py
b/tests/dtest.py
index 49bbfaac620382c5b6dad70bf6aa81c9f4428c39..67b2b8f6afd6cc08d0f4942a9cba70139a927782 100644
(file)
--- 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
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)
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)
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:
if waited > 0:
- print " took about %
d
s for socket to appear" % waited
+ print " took about %
s
s for socket to appear" % waited
# Wait for root user to be created
command(["disorder",
"--config", disorder._configfile, "--no-per-user-config",
# Wait for root user to be created
command(["disorder",
"--config", disorder._configfile, "--no-per-user-config",