#-*-python-*-
#
# This file is part of DisOrder.
-# Copyright (C) 2007 ,2008 Richard Kettlewell
+# Copyright (C) 2007-2009 Richard Kettlewell
#
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
"""Utility module used by tests"""
-import os,os.path,subprocess,sys,re,time,unicodedata,random,socket
+import os,os.path,subprocess,sys,re,time,unicodedata,random,socket,traceback
def fatal(s):
"""Write an error message and exit"""
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")
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_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.
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
+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
tracklength *.ogg disorder-tracklength
tracklength *.wav disorder-tracklength
tracklength *.flac disorder-tracklength
-api network
+api rtp
broadcast 127.0.0.1 %d
broadcast_from 127.0.0.1 %d
mail_sender no.such.user.sorry@greenend.org.uk
os.mkdir(testroot)
# Choose a port
global port
- port = random.randint(49152, 65535)
+ port = random.randint(49152, 65530)
while not bindable(port + 1):
print "port %d is not bindable, trying another" % (port + 1)
- port = random.randint(49152, 65535)
+ port = random.randint(49152, 65530)
# Log anything sent to that port
packetlog = "%s/packetlog" % testroot
subprocess.Popen(["disorder-udplog",
time.sleep(1)
print " starting daemon"
# remove the socket if it exists
- socket = "%s/socket" % testroot
- try:
+ socket = "%s/home/socket" % testroot
+ if os.path.exists(socket):
os.remove(socket)
- except:
- pass
daemon = subprocess.Popen(["disorderd",
"--foreground",
"--config", "%s/config" % testroot],
stderr=errs)
# Wait for the socket to be created
waited = 0
+ sleep_resolution = 0.125
while not os.path.exists(socket):
rc = daemon.poll()
if rc is not None:
print "FATAL: daemon failed to start up"
sys.exit(1)
- waited += 1
+ waited += sleep_resolution
+ if sleep_resolution < 1:
+ sleep_resolution *= 2
if waited == 1:
print " waiting for socket..."
elif waited >= 60:
print "FATAL: took too long for socket to appear"
sys.exit(1)
- time.sleep(1)
+ time.sleep(sleep_resolution)
if waited > 0:
- print " took about %ds for socket to appear" % waited
+ 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",
+ "--wait-for-root"])
def create_user(username="fred", password="fredpass"):
"""create_user(USERNAME, PASSWORD)
"--user", "root", "edituser", username, "rights", "all"])
def rescan(c=None):
- class rescan_monitor(disorder.monitor):
- def rescanned(self):
- return False
+ print " initiating rescan"
if c is None:
c = disorder.client()
- m = rescan_monitor()
- print " initiating rescan"
- c.rescan()
- print " waiting for rescan to complete"
- m.run()
+ c.rescan('wait')
print " rescan completed"
def stop_daemon():
rc = daemon.poll()
if rc == None:
print " stopping daemon"
- disorder.client().shutdown()
+ os.kill(daemon.pid, 15)
print " waiting for daemon"
rc = daemon.wait()
- print " daemon has stopped"
+ print " daemon has stopped (rc=%d)" % rc
else:
print " daemon already stopped"
daemon = None
Run the test in MODULE. This can be a string (in which case the module
will be imported) or a module object."""
- global tests
+ global tests, failures
tests += 1
# Locate the test module
if module is None:
if type(module) == str:
module = __import__(module)
name = module.__name__
+ print "--- %s ---" % name
# Open the error log
global errs
logfile = "%s.log" % name
stdtracks()
try:
module.test()
- finally:
- stop_daemon()
+ except Exception, e:
+ traceback.print_exc(None, sys.stderr)
+ failures += 1
+ stop_daemon()
if report:
if failures:
print " FAILED"
~mdw / disorder / blobdiff