X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/3dd7ec41f4067b35740aba970b6405dbd3113f8f..477b12ff719d3749b8d8f85035bd6384fee9be0d:/tests/dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index 6f9e6a8..0cb968a 100644
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -20,12 +20,20 @@
 """Utility module used by tests"""
 
 import os,os.path,subprocess,sys,re,time,unicodedata,random,socket,traceback
+import atexit,base64,errno
+
+homelink = None
 
 def fatal(s):
     """Write an error message and exit"""
     sys.stderr.write("ERROR: %s\n" % s)
     sys.exit(1)
 
+@atexit.register
+def cleanup():
+    if homelink is not None:
+        os.unlink(homelink)
+
 # Identify the top build directory
 cwd = os.getcwd()
 if os.path.exists("config.h"):
@@ -46,6 +54,13 @@ ospath.insert(0, os.path.join(top_builddir, "clients"))
 ospath.insert(0, os.path.join(top_builddir, "tests"))
 os.environ["PATH"] = os.pathsep.join(ospath)
 
+# Some of our track names contain non-ASCII characters, and the server will
+# be sad if it can't convert them according to the current locale.  Make sure
+# we have something plausible.
+locale = os.environ.get("LANG")
+if locale is None or locale == "C" or locale == "POSIX":
+    os.environ["LANG"] = "C.UTF-8"
+
 # Parse the makefile in the current directory to identify the source directory
 top_srcdir = None
 for l in file("Makefile"):
@@ -167,7 +182,7 @@ def bindable(p):
 def default_config(encoding="UTF-8"):
     """Write the default config"""
     open("%s/config" % testroot, "w").write(
-    """home %s/home
+    """home %s
 collection fs %s %s/tracks
 scratch %s/scratch.ogg
 queue_pad 5
@@ -193,12 +208,33 @@ api rtp
 broadcast 127.0.0.1 %d
 broadcast_from 127.0.0.1 %d
 mail_sender no.such.user.sorry@greenend.org.uk
-""" % (testroot, encoding, testroot, testroot, top_builddir, top_builddir,
+""" % (homelink, encoding, testroot, testroot, top_builddir, top_builddir,
        port, port + 1))
 
 def common_setup():
+    global homelink
     remove_dir(testroot)
     os.makedirs(testroot)
+    os.makedirs("%s/home" % testroot)
+    # Establish a symlink to the home directory, to keep the socket pathnames
+    # short enough.
+    tmpdir = "/tmp"
+    for v in ["TMPDIR", "TMP"]:
+        try: tmpdir = os.environ[v]
+        except KeyError: pass
+        else: break
+    for i in xrange(1024):
+        r = base64.b64encode(os.urandom(9)).replace("/", "_")
+        f = "%s/disorder-home.%s" % (tmpdir, r)
+        try:
+            os.symlink("%s/home" % testroot, f)
+        except OSError, e:
+            if e.errno != errno.EEXIST: raise
+        else:
+            homelink = f
+            break
+    else:
+        fatal("failed to make home link")
     # Choose a port
     global port
     port = random.randint(49152, 65530)
@@ -228,7 +264,7 @@ Start the daemon."""
             time.sleep(1)
     print " starting daemon"
     # remove the socket if it exists
-    socket = "%s/home/socket" % testroot
+    socket = "%s/socket" % homelink
     if os.path.exists(socket):
         os.remove(socket)
     daemon = subprocess.Popen(["disorderd",