New examples/disorder.rc is an /etc/rc.d script for FreeBSD. Finish

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index 5ab56edd48a95904e775e437d6352a6255077452..982f4d499d07a9ff44305659886da51bd558e329 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -180,7 +180,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
-trust fred root
 plugins
 plugins %s/plugins
 plugins %s/plugins/.libs
@@ -192,9 +191,10 @@ 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
+mail_sender no.such.user.sorry@greenend.org.uk
 """ % (testroot, testroot, testroot, top_builddir, top_builddir,
        port, port + 1))
 
@@ -259,11 +259,15 @@ Start the daemon."""
 def create_user(username="fred", password="fredpass"):
     """create_user(USERNAME, PASSWORD)
 
-    Create a user, abusing direct database access to do so."""
+    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 stop_daemon():
     """stop_daemon()
@@ -303,7 +307,12 @@ def run(module=None, report=True):
         name = module.__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