chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'branchpoint-5.1' into release
[disorder]
/
tests
/
dtest.py
diff --git
a/tests/dtest.py
b/tests/dtest.py
index 8262a036f685be1ab483b01c1005290707192711..a8ea64cdb526ecc136e269c7596be743a09e17ff 100644
(file)
--- a/
tests/dtest.py
+++ b/
tests/dtest.py
@@
-1,27
+1,25
@@
#-*-python-*-
#
# This file is part of DisOrder.
#-*-python-*-
#
# This file is part of DisOrder.
-# Copyright (C) 2007 Richard Kettlewell
+# Copyright (C) 2007
-2012
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
# 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.
#
# (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
+# G
NU G
eneral Public License for more details.
+#
# You should have received a copy of the GNU General Public License
# 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"""
#
"""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"""
def fatal(s):
"""Write an error message and exit"""
@@
-32,7
+30,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
+85,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/
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.
# 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
+164,13
@@
def bindable(p):
except:
return False
except:
return False
-def default_config():
+def default_config(
encoding="UTF-8"
):
"""Write the default config"""
open("%s/config" % testroot, "w").write(
"""Write the default config"""
open("%s/config" % testroot, "w").write(
- """home %s
-collection fs
UTF-8
%s/tracks
+ """home %s
/home
+collection fs
%s
%s/tracks
scratch %s/scratch.ogg
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
@@
-191,10
+189,11
@@
tracklength *.mp3 disorder-tracklength
tracklength *.ogg disorder-tracklength
tracklength *.wav disorder-tracklength
tracklength *.flac disorder-tracklength
tracklength *.ogg disorder-tracklength
tracklength *.wav disorder-tracklength
tracklength *.flac disorder-tracklength
-speaker_backend network
+api rtp
broadcast 127.0.0.1 %d
broadcast_from 127.0.0.1 %d
broadcast 127.0.0.1 %d
broadcast_from 127.0.0.1 %d
-""" % (testroot, testroot, testroot, top_builddir, top_builddir,
+mail_sender no.such.user.sorry@greenend.org.uk
+""" % (testroot, encoding, testroot, testroot, top_builddir, top_builddir,
port, port + 1))
def common_setup():
port, port + 1))
def common_setup():
@@
-202,10
+201,10
@@
def common_setup():
os.mkdir(testroot)
# Choose a port
global port
os.mkdir(testroot)
# Choose a port
global port
- port = random.randint(49152, 6553
5
)
+ port = random.randint(49152, 6553
0
)
while not bindable(port + 1):
print "port %d is not bindable, trying another" % (port + 1)
while not bindable(port + 1):
print "port %d is not bindable, trying another" % (port + 1)
- port = random.randint(49152, 6553
5
)
+ port = random.randint(49152, 6553
0
)
# Log anything sent to that port
packetlog = "%s/packetlog" % testroot
subprocess.Popen(["disorder-udplog",
# Log anything sent to that port
packetlog = "%s/packetlog" % testroot
subprocess.Popen(["disorder-udplog",
@@
-229,31
+228,36
@@
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
-
try
:
+ socket = "%s/
home/
socket" % testroot
+
if os.path.exists(socket)
:
os.remove(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
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)
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)
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:
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(["disorderd",
+ "--config", disorder._configfile,
+ "--wait-for-root"])
def create_user(username="fred", password="fredpass"):
"""create_user(USERNAME, PASSWORD)
def create_user(username="fred", password="fredpass"):
"""create_user(USERNAME, PASSWORD)
@@
-268,20
+272,28
@@
def create_user(username="fred", password="fredpass"):
"--config", disorder._configfile, "--no-per-user-config",
"--user", "root", "edituser", username, "rights", "all"])
"--config", disorder._configfile, "--no-per-user-config",
"--user", "root", "edituser", username, "rights", "all"])
+def rescan(c=None):
+ print " initiating rescan"
+ if c is None:
+ c = disorder.client()
+ c.rescan('wait')
+ print " rescan completed"
+
def stop_daemon():
"""stop_daemon()
Stop the daemon if it has not stopped already"""
global daemon
if daemon == None:
def stop_daemon():
"""stop_daemon()
Stop the daemon if it has not stopped already"""
global daemon
if daemon == None:
+ print " (daemon not running)"
return
rc = daemon.poll()
if rc == None:
print " stopping daemon"
return
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 " waiting for daemon"
rc = daemon.wait()
- print " daemon has stopped
"
+ print " daemon has stopped
(rc=%d)" % rc
else:
print " daemon already stopped"
daemon = None
else:
print " daemon already stopped"
daemon = None
@@
-291,7
+303,7
@@
def run(module=None, report=True):
Run the test in MODULE. This can be a string (in which case the module
will be imported) or a module object."""
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:
tests += 1
# Locate the test module
if module is None:
@@
-304,6
+316,7
@@
def run(module=None, report=True):
if type(module) == str:
module = __import__(module)
name = module.__name__
if type(module) == str:
module = __import__(module)
name = module.__name__
+ print "--- %s ---" % name
# Open the error log
global errs
logfile = "%s.log" % name
# Open the error log
global errs
logfile = "%s.log" % name
@@
-321,8
+334,12
@@
def run(module=None, report=True):
stdtracks()
try:
module.test()
stdtracks()
try:
module.test()
+ except Exception, e:
+ traceback.print_exc(None, sys.stderr)
+ failures += 1
finally:
stop_daemon()
finally:
stop_daemon()
+ os.system("ps -ef | grep disorderd")
if report:
if failures:
print " FAILED"
if report:
if failures:
print " FAILED"
@@
-352,28
+369,30
@@
def lists_have_same_contents(l1, l2):
s2 = []
s2.extend(l2)
s2.sort()
s2 = []
s2.extend(l2)
s2.sort()
- return
s1 == s2
+ return
map(nfc, s1) == map(nfc, s2)
-def check_files():
+def check_files(
chatty=True
):
c = disorder.client()
failures = 0
for d in dirs_by_dir:
xdirs = dirs_by_dir[d]
dirs = c.directories(d)
if not lists_have_same_contents(xdirs, dirs):
c = disorder.client()
failures = 0
for d in dirs_by_dir:
xdirs = dirs_by_dir[d]
dirs = c.directories(d)
if not lists_have_same_contents(xdirs, dirs):
- print
- print "directory: %s" % d
- print "expected: %s" % xdirs
- print "got: %s" % dirs
+ if chatty:
+ print
+ print "directory: %s" % d
+ print "expected: %s" % xdirs
+ print "got: %s" % dirs
failures += 1
for d in files_by_dir:
xfiles = files_by_dir[d]
files = c.files(d)
if not lists_have_same_contents(xfiles, files):
failures += 1
for d in files_by_dir:
xfiles = files_by_dir[d]
files = c.files(d)
if not lists_have_same_contents(xfiles, files):
- print
- print "directory: %s" % d
- print "expected: %s" % xfiles
- print "got: %s" % files
+ if chatty:
+ print
+ print "directory: %s" % d
+ print "expected: %s" % xfiles
+ print "got: %s" % files
failures += 1
return failures
failures += 1
return failures
~mdw / disorder / blobdiff