tests/dtest.py: Maintain a separate test root for each test.

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index a5a8be9..6f9e6a8 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -1,7 +1,7 @@
 #-*-python-*-
 #
 # This file is part of DisOrder.
-# Copyright (C) 2007-2009 Richard Kettlewell
+# Copyright (C) 2007-2012 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
@@ -170,7 +170,6 @@ def default_config(encoding="UTF-8"):
     """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
@@ -199,7 +198,7 @@ mail_sender no.such.user.sorry@greenend.org.uk
 
 def common_setup():
     remove_dir(testroot)
-    os.mkdir(testroot)
+    os.makedirs(testroot)
     # Choose a port
     global port
     port = random.randint(49152, 65530)
@@ -256,8 +255,8 @@ Start the daemon."""
     if waited > 0:
         print "  took about %ss for socket to appear" % waited
     # Wait for root user to be created
-    command(["disorder",
-             "--config", disorder._configfile, "--no-per-user-config",
+    command(["disorderd",
+             "--config", disorder._configfile,
              "--wait-for-root"])
 
 def create_user(username="fred", password="fredpass"):
@@ -411,5 +410,6 @@ def command(args):
 tests = 0
 failures = 0
 daemon = None
-testroot = "%s/tests/testroot" % top_builddir
+testroot = "%s/tests/testroot/%s" % \
+           (top_builddir, os.path.basename(sys.argv[0]))
 tracks = "%s/tracks" % testroot