X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/6ce6b5a9430b1b8749d832ecabe840a7b65d74de..05438e8999dbc0edc4cc82c3df4cc5efdedb777e:/tests/dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index cd87c50..be45435 100644
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -1,7 +1,7 @@
 #-*-python-*-
 #
 # This file is part of DisOrder.
-# Copyright (C) 2007 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/slap.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.
@@ -166,26 +166,14 @@ def bindable(p):
     except:
         return False
 
-def common_setup():
-    remove_dir(testroot)
-    os.mkdir(testroot)
-    # Choose a port
-    global port
-    port = random.randint(49152, 65535)
-    while not bindable(port + 1):
-        print "port %d is not bindable, trying another" % (port + 1)
-        port = random.randint(49152, 65535)
-    # Log anything sent to that port
-    packetlog = "%s/packetlog" % testroot
-    subprocess.Popen(["disorder-udplog",
-                      "--output", packetlog,
-                      "127.0.0.1", "%d" % port])
-    # disorder-udplog will quit when its parent process terminates
+def default_config(encoding="UTF-8"):
+    """Write the default config"""
     open("%s/config" % testroot, "w").write(
-    """home %s
-collection fs UTF-8 %s/tracks
+    """home %s/home
+collection fs %s %s/tracks
 scratch %s/scratch.ogg
 gap 0
+queue_pad 5
 stopword 01 02 03 04 05 06 07 08 09 10
 stopword 1 2 3 4 5 6 7 8 9
 stopword 11 12 13 14 15 16 17 18 19 20
@@ -193,8 +181,6 @@ stopword 21 22 23 24 25 26 27 28 29 30
 stopword the a an and to too in on of we i am as im for is
 username fred
 password fredpass
-allow fred fredpass
-trust fred
 plugins
 plugins %s/plugins
 plugins %s/plugins/.libs
@@ -206,13 +192,31 @@ tracklength *.mp3 disorder-tracklength
 tracklength *.ogg disorder-tracklength
 tracklength *.wav disorder-tracklength
 tracklength *.flac disorder-tracklength
-speaker_backend network
+api network
 broadcast 127.0.0.1 %d
 broadcast_from 127.0.0.1 %d
-""" % (testroot, testroot, testroot, top_builddir, top_builddir,
+mail_sender no.such.user.sorry@greenend.org.uk
+""" % (testroot, encoding, testroot, testroot, top_builddir, top_builddir,
        port, port + 1))
+
+def common_setup():
+    remove_dir(testroot)
+    os.mkdir(testroot)
+    # Choose a port
+    global port
+    port = random.randint(49152, 65535)
+    while not bindable(port + 1):
+        print "port %d is not bindable, trying another" % (port + 1)
+        port = random.randint(49152, 65535)
+    # Log anything sent to that port
+    packetlog = "%s/packetlog" % testroot
+    subprocess.Popen(["disorder-udplog",
+                      "--output", packetlog,
+                      "127.0.0.1", "%d" % port])
+    # disorder-udplog will quit when its parent process terminates
     copyfile("%s/sounds/scratch.ogg" % top_srcdir,
              "%s/scratch.ogg" % testroot)
+    default_config()
 
 def start_daemon():
     """start_daemon()
@@ -227,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:
@@ -253,6 +257,26 @@ Start the daemon."""
     if waited > 0:
         print "  took about %ds for socket to appear" % waited
 
+def create_user(username="fred", password="fredpass"):
+    """create_user(USERNAME, PASSWORD)
+
+    Create a user, abusing direct database access to do so.  Gives the
+    user rights 'all', allowing them to do anything."""
+    print " creating user %s" % username
+    command(["disorder",
+             "--config", disorder._configfile, "--no-per-user-config",
+             "--user", "root", "adduser", username, password])
+    command(["disorder",
+             "--config", disorder._configfile, "--no-per-user-config",
+             "--user", "root", "edituser", username, "rights", "all"])
+
+def rescan(c=None):
+    print " initiating rescan"
+    if c is None:
+        c = disorder.client()
+    c.rescan('wait')
+    print " rescan completed"
+
 def stop_daemon():
     """stop_daemon()
 
@@ -289,9 +313,15 @@ 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
-    errs = open("%s.log" % name, "w")
+    logfile = "%s.log" % name
+    try:
+        os.remove(logfile)
+    except:
+        pass
+    errs = open(logfile, "a")
     # Ensure that disorder.py uses the test installation
     disorder._configfile = "%s/config" % testroot
     disorder._userconf = False
@@ -300,12 +330,7 @@ def run(module=None, report=True):
     # Create some standard tracks
     stdtracks()
     try:
-        try:
-            module.test()
-        except AssertionError, e:
-            global failures
-            failures += 1
-            print "assertion failed: %s" % e.message
+        module.test()
     finally:
         stop_daemon()
     if report:
@@ -337,28 +362,30 @@ def lists_have_same_contents(l1, l2):
     s2 = []
     s2.extend(l2)
     s2.sort()
-    return s1 == s2
+    return map(nfc, s1) == map(nfc, s2)
 
-def check_files():
+def check_files(chatty=True):
     c = disorder.client()
     failures = 0
     for d in dirs_by_dir:
         xdirs = dirs_by_dir[d]
         dirs = c.directories(d)
         if not lists_have_same_contents(xdirs, dirs):
-            print
-            print "directory: %s" % d
-            print "expected:  %s" % xdirs
-            print "got:       %s" % dirs
+            if chatty:
+                print
+                print "directory: %s" % d
+                print "expected:  %s" % xdirs
+                print "got:       %s" % dirs
             failures += 1
     for d in files_by_dir:
         xfiles = files_by_dir[d]
         files = c.files(d)
         if not lists_have_same_contents(xfiles, files):
-            print
-            print "directory: %s" % d
-            print "expected:  %s" % xfiles
-            print "got:       %s" % files
+            if chatty:
+                print
+                print "directory: %s" % d
+                print "expected:  %s" % xfiles
+                print "got:       %s" % files
             failures += 1
     return failures