~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests/dtest.py: Maintain a separate test root for each test.
[disorder]
/
tests
/
dtest.py
diff --git
a/tests/dtest.py
b/tests/dtest.py
index
67b2b8f
..
6f9e6a8
100644
(file)
--- a/
tests/dtest.py
+++ b/
tests/dtest.py
@@
-1,7
+1,7
@@
#-*-python-*-
#
# This file is part of DisOrder.
#-*-python-*-
#
# This file is part of DisOrder.
-# Copyright (C) 2007-20
09
Richard Kettlewell
+# Copyright (C) 2007-20
12
Richard Kettlewell
#
# 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
#
# 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
@@
-85,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/long.ogg" % top_
build
dir, trackpath)
+ copyfile("%s/sounds/long.ogg" % top_
src
dir, 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.
@@
-170,7
+170,6
@@
def default_config(encoding="UTF-8"):
"""home %s/home
collection fs %s %s/tracks
scratch %s/scratch.ogg
"""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
queue_pad 5
stopword 01 02 03 04 05 06 07 08 09 10
stopword 1 2 3 4 5 6 7 8 9
@@
-199,7
+198,7
@@
mail_sender no.such.user.sorry@greenend.org.uk
def common_setup():
remove_dir(testroot)
def common_setup():
remove_dir(testroot)
- os.m
kdir
(testroot)
+ os.m
akedirs
(testroot)
# Choose a port
global port
port = random.randint(49152, 65530)
# Choose a port
global port
port = random.randint(49152, 65530)
@@
-256,8
+255,8
@@
Start the daemon."""
if waited > 0:
print " took about %ss for socket to appear" % waited
# Wait for root user to be created
if waited > 0:
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",
+ command(["disorder
d
",
+ "--config", disorder._configfile,
"--wait-for-root"])
def create_user(username="fred", password="fredpass"):
"--wait-for-root"])
def create_user(username="fred", password="fredpass"):
@@
-286,6
+285,7
@@
def stop_daemon():
Stop the daemon if it has not stopped already"""
global daemon
if daemon == None:
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:
return
rc = daemon.poll()
if rc == None:
@@
-297,8
+297,6
@@
Stop the daemon if it has not stopped already"""
else:
print " daemon already stopped"
daemon = None
else:
print " daemon already stopped"
daemon = None
- # Wait a bit for subprocess to finish too, to try to avoid stupid races
- time.sleep(2)
def run(module=None, report=True):
"""dtest.run(MODULE)
def run(module=None, report=True):
"""dtest.run(MODULE)
@@
-339,7
+337,9
@@
def run(module=None, report=True):
except Exception, e:
traceback.print_exc(None, sys.stderr)
failures += 1
except Exception, e:
traceback.print_exc(None, sys.stderr)
failures += 1
- stop_daemon()
+ finally:
+ stop_daemon()
+ os.system("ps -ef | grep disorderd")
if report:
if failures:
print " FAILED"
if report:
if failures:
print " FAILED"
@@
-410,5
+410,6
@@
def command(args):
tests = 0
failures = 0
daemon = None
tests = 0
failures = 0
daemon = None
-testroot = "%s/tests/testroot" % top_builddir
+testroot = "%s/tests/testroot/%s" % \
+ (top_builddir, os.path.basename(sys.argv[0]))
tracks = "%s/tracks" % testroot
tracks = "%s/tracks" % testroot