From fc9c24e3ebb095d05e2d140526289c622d6e5504 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Wed, 21 Nov 2007 11:12:22 +0000 Subject: [PATCH] more disorder.unicode test alignment Organization: Straylight/Edgeware From: Richard Kettlewell --- tests/dtest.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/dtest.py b/tests/dtest.py index 7faa809..38c7219 100644 --- a/tests/dtest.py +++ b/tests/dtest.py @@ -70,7 +70,7 @@ def maketrack(s): """maketrack(S) Make track with relative path S exist""" - trackpath = "%s/tracks/%s" % (testroot, s) + trackpath = "%s/%s" % (tracks, s) trackdir = os.path.dirname(trackpath) if not os.path.exists(trackdir): os.makedirs(trackdir) @@ -82,18 +82,16 @@ def stdtracks(): maketrack("Joe Bloggs/First Album/03:Third track.ogg") maketrack("Joe Bloggs/First Album/04:Fourth track.ogg") maketrack("Joe Bloggs/First Album/05:Fifth track.ogg") - maketrack("Joe Bloggs/First Album/05:Fifth track.ogg") maketrack("Joe Bloggs/Second Album/01:First track.ogg") maketrack("Joe Bloggs/Second Album/02:Second track.ogg") maketrack("Joe Bloggs/Second Album/03:Third track.ogg") maketrack("Joe Bloggs/Second Album/04:Fourth track.ogg") maketrack("Joe Bloggs/Second Album/05:Fifth track.ogg") - maketrack("Joe Bloggs/Second Album/05:Fifth track.ogg") - maketrack("Joe Bloggs/First Album/01:First track.ogg") - maketrack("Joe Bloggs/First Album/02:Second track.ogg") - maketrack("Joe Bloggs/First Album/03:Third track.ogg") - maketrack("Joe Bloggs/First Album/04:Fourth track.ogg") - maketrack("Joe Bloggs/First Album/05:Fifth track.ogg") + maketrack("Joe Bloggs/Third Album/01:First track.ogg") + maketrack("Joe Bloggs/Third Album/02:Second track.ogg") + maketrack("Joe Bloggs/Third Album/03:Third track.ogg") + maketrack("Joe Bloggs/Third Album/04:Fourth track.ogg") + maketrack("Joe Bloggs/Third Album/05:Fifth track.ogg") maketrack("Fred Smith/Boring/01:Dull.ogg") maketrack("Fred Smith/Boring/02:Tedious.ogg") maketrack("Fred Smith/Boring/03:Drum Solo.ogg") @@ -136,7 +134,7 @@ def start_daemon(): """start_daemon() Start the daemon.""" - global daemon + global daemon, errs assert daemon == None print " starting daemon" daemon = subprocess.Popen(["disorderd", -- [mdw]