Merge more 3.0 branch changes

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index 6a275a890bb0a6fbebd1b6cd70530c0a4a3137f0..c37872d6baae568e5ff5e955f4c0a071d10f0cb4 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -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_srcdir, 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,13 +166,14 @@ def bindable(p):
     except:
         return False
 
-def default_config():
+def default_config(encoding="UTF-8"):
     """Write the default config"""
     open("%s/config" % testroot, "w").write(
     """home %s
-collection fs UTF-8 %s/tracks
+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
@@ -195,7 +196,7 @@ 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,
+""" % (testroot, encoding, testroot, testroot, top_builddir, top_builddir,
        port, port + 1))
 
 def common_setup():