Start reimplenting search in Disobedience choose tabs. Results are

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index 9439bcead790db6c5242339aedd0dfe240b0ccdf..be454354b3e2a799c19c0262be043b715d0c2442 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():


@@ -319,6 +313,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