more testing

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index cd14cfbbce5cd7df210bcd9241c25153cd510079..cd87c503788b9bdb58a40a2bc0ddd260658d33e9 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -21,7 +21,7 @@
 
 """Utility module used by tests"""
 
 
 """Utility module used by tests"""
 

-import os,os.path,subprocess,sys,re,time,unicodedata,random
+import os,os.path,subprocess,sys,re,time,unicodedata,random,socket

 
 def fatal(s):
     """Write an error message and exit"""
 
 def fatal(s):
     """Write an error message and exit"""


@@ -45,6 +45,7 @@ import disorder
 ospath = os.environ["PATH"].split(os.pathsep)
 ospath.insert(0, os.path.join(top_builddir, "server"))
 ospath.insert(0, os.path.join(top_builddir, "clients"))
 ospath = os.environ["PATH"].split(os.pathsep)
 ospath.insert(0, os.path.join(top_builddir, "server"))
 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)
 
 # Parse the makefile in the current directory to identify the source directory
 os.environ["PATH"] = os.pathsep.join(ospath)
 
 # Parse the makefile in the current directory to identify the source directory


@@ -150,12 +151,36 @@ def stdtracks():
     maketrack("misc/blahblahblah.ogg")
     maketrack("Various/Greatest Hits/01:Jim Whatever - Spong.ogg")
     maketrack("Various/Greatest Hits/02:Joe Bloggs - Yadda.ogg")
     maketrack("misc/blahblahblah.ogg")
     maketrack("Various/Greatest Hits/01:Jim Whatever - Spong.ogg")
     maketrack("Various/Greatest Hits/02:Joe Bloggs - Yadda.ogg")

- 
+
+def bindable(p):
+    """bindable(P)
+
+    Return True iff UDP port P is bindable, else False"""
+    s = socket.socket(socket.AF_INET,
+                      socket.SOCK_DGRAM,
+                      socket.IPPROTO_UDP)
+    try:
+        s.bind(("127.0.0.1", p))
+        s.close()
+        return True
+    except:
+        return False
+

 def common_setup():
     remove_dir(testroot)
     os.mkdir(testroot)
 def common_setup():
     remove_dir(testroot)
     os.mkdir(testroot)

+    # Choose a port

     global port
     port = random.randint(49152, 65535)
     global port
     port = random.randint(49152, 65535)

+    while not bindable(port + 1):
+        print "port %d is not bindable, trying another" % (port + 1)
+        port = random.randint(49152, 65535)
+    # Log anything sent to that port
+    packetlog = "%s/packetlog" % testroot
+    subprocess.Popen(["disorder-udplog",
+                      "--output", packetlog,
+                      "127.0.0.1", "%d" % port])
+    # disorder-udplog will quit when its parent process terminates

     open("%s/config" % testroot, "w").write(
     """home %s
 collection fs UTF-8 %s/tracks
     open("%s/config" % testroot, "w").write(
     """home %s
 collection fs UTF-8 %s/tracks


@@ -193,8 +218,13 @@ def start_daemon():
     """start_daemon()
 
 Start the daemon."""
     """start_daemon()
 
 Start the daemon."""

-    global daemon, errs
+    global daemon, errs, port

     assert daemon == None, "no daemon running"
     assert daemon == None, "no daemon running"

+    if not bindable(port + 1):
+        print "waiting for port %d to become bindable again..." % (port + 1)
+        time.sleep(1)
+        while not bindable(port + 1):
+            time.sleep(1)

     print " starting daemon"
     # remove the socket if it exists
     socket = "%s/socket" % testroot
     print " starting daemon"
     # remove the socket if it exists
     socket = "%s/socket" % testroot


@@ -297,15 +327,25 @@ Recursively delete directory D"""
         else:
             os.remove(d)
 
         else:
             os.remove(d)
 

+def lists_have_same_contents(l1, l2):
+    """lists_have_same_contents(L1, L2)
+
+    Return True if L1 and L2 have equal members, in any order; else False."""
+    s1 = []
+    s1.extend(l1)
+    s1.sort()
+    s2 = []
+    s2.extend(l2)
+    s2.sort()
+    return s1 == s2
+

 def check_files():
     c = disorder.client()
     failures = 0
     for d in dirs_by_dir:
         xdirs = dirs_by_dir[d]
         dirs = c.directories(d)
 def check_files():
     c = disorder.client()
     failures = 0
     for d in dirs_by_dir:
         xdirs = dirs_by_dir[d]
         dirs = c.directories(d)

-        xdirs.sort()
-        dirs.sort()
-        if dirs != xdirs:
+        if not lists_have_same_contents(xdirs, dirs):

             print
             print "directory: %s" % d
             print "expected:  %s" % xdirs
             print
             print "directory: %s" % d
             print "expected:  %s" % xdirs


@@ -314,9 +354,7 @@ def check_files():
     for d in files_by_dir:
         xfiles = files_by_dir[d]
         files = c.files(d)
     for d in files_by_dir:
         xfiles = files_by_dir[d]
         files = c.files(d)

-        xfiles.sort()
-        files.sort()
-        if files != xfiles:
+        if not lists_have_same_contents(xfiles, files):

             print
             print "directory: %s" % d
             print "expected:  %s" % xfiles
             print
             print "directory: %s" % d
             print "expected:  %s" % xfiles