chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wait a bit after stopping the daemon when testsing, to stop silly
[disorder]
/
tests
/
dtest.py
diff --git
a/tests/dtest.py
b/tests/dtest.py
index 9439bcead790db6c5242339aedd0dfe240b0ccdf..5015c4893a573afd9664d7729d772984c1bdecc6 100644
(file)
--- a/
tests/dtest.py
+++ b/
tests/dtest.py
@@
-271,16
+271,10
@@
def create_user(username="fred", password="fredpass"):
"--user", "root", "edituser", username, "rights", "all"])
def rescan(c=None):
"--user", "root", "edituser", username, "rights", "all"])
def rescan(c=None):
- class rescan_monitor(disorder.monitor):
- def rescanned(self):
- return False
+ print " initiating rescan"
if c is None:
c = disorder.client()
if c is None:
c = disorder.client()
- m = rescan_monitor()
- print " initiating rescan"
- c.rescan()
- print " waiting for rescan to complete"
- m.run()
+ c.rescan('wait')
print " rescan completed"
def stop_daemon():
print " rescan completed"
def stop_daemon():
@@
-300,6
+294,8
@@
Stop the daemon if it has not stopped already"""
else:
print " daemon already stopped"
daemon = None
else:
print " daemon already stopped"
daemon = None
+ # Wait a bit for subprocess to finish too, to try to avoid stupid races
+ time.sleep(1)
def run(module=None, report=True):
"""dtest.run(MODULE)
def run(module=None, report=True):
"""dtest.run(MODULE)
@@
-319,6
+315,7
@@
def run(module=None, report=True):
if type(module) == str:
module = __import__(module)
name = module.__name__
if type(module) == str:
module = __import__(module)
name = module.__name__
+ print "--- %s ---" % name
# Open the error log
global errs
logfile = "%s.log" % name
# Open the error log
global errs
logfile = "%s.log" % name