Merge event scheduling implementation. This fixes defect #6,

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index 9439bcead790db6c5242339aedd0dfe240b0ccdf..5eac2ea6ba519f652cb17d95ba803e008bf6cf3a 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):
-    class rescan_monitor(disorder.monitor):
-        def rescanned(self):
-            return False
+    print " initiating rescan"
     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():