more template work

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index fff18664a77c951855f3827045145cdad9132fa7..9439bcead790db6c5242339aedd0dfe240b0ccdf 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -1,7 +1,7 @@
 #-*-python-*-
 #
 # This file is part of DisOrder.
 #-*-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
 #
 # 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
 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")
     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)
     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.
     # 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,10 +169,11 @@ def bindable(p):
 def default_config(encoding="UTF-8"):
     """Write the default config"""
     open("%s/config" % testroot, "w").write(
 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
 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
 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


@@ -230,7 +231,7 @@ Start the daemon."""
             time.sleep(1)
     print " starting daemon"
     # remove the socket if it exists
             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:
     try:
         os.remove(socket)
     except: