X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/566145652162e02433c1cd461bf9b5e312abbc40..329187828a516a0a013cb8cffb8ab163e0769495:/tests/dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index c37872d..be45435 100644
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -1,7 +1,7 @@
 #-*-python-*-
 #
 # This file is part of DisOrder.
-# Copyright (C) 2007 ,2008 Richard Kettlewell
+# Copyright (C) 2007, 2008 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@ def fatal(s):
 cwd = os.getcwd()
 if os.path.exists("config.h"):
     top_builddir = cwd
-elif os.path.exists("alltests"):
+elif os.path.exists("../config.h"):
     top_builddir = os.path.dirname(cwd)
 else:
     fatal("cannot identify build directory")
@@ -87,7 +87,7 @@ Make track with relative path S exist"""
     trackdir = os.path.dirname(trackpath)
     if not os.path.exists(trackdir):
         os.makedirs(trackdir)
-    copyfile("%s/sounds/long.ogg" % top_srcdir, trackpath)
+    copyfile("%s/sounds/long.ogg" % top_builddir, trackpath)
     # We record the tracks we created so they can be tested against
     # server responses.  We put them into NFC since that's what the server
     # uses internally.
@@ -169,7 +169,7 @@ def bindable(p):
 def default_config(encoding="UTF-8"):
     """Write the default config"""
     open("%s/config" % testroot, "w").write(
-    """home %s
+    """home %s/home
 collection fs %s %s/tracks
 scratch %s/scratch.ogg
 gap 0
@@ -231,7 +231,7 @@ Start the daemon."""
             time.sleep(1)
     print " starting daemon"
     # remove the socket if it exists
-    socket = "%s/socket" % testroot
+    socket = "%s/home/socket" % testroot
     try:
         os.remove(socket)
     except:
@@ -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():
@@ -319,6 +313,7 @@ def run(module=None, report=True):
         if type(module) == str:
             module = __import__(module)
         name = module.__name__
+    print "--- %s ---" % name
     # Open the error log
     global errs
     logfile = "%s.log" % name