chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up
[disorder]
/
tests
/
play.py
diff --git
a/tests/play.py
b/tests/play.py
index 43deaff7dc9d04c794fc99957e8cec0190b7b19a..c298ce514656403f6133de31f13b38e3abcc2fec 100755
(executable)
--- a/
tests/play.py
+++ b/
tests/play.py
@@
-18,12
+18,13
@@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
#
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
#
-import dtest,time,disorder,re
+import dtest,time,disorder,re
,sys
def test():
"""Play some tracks"""
dtest.start_daemon()
dtest.create_user()
def test():
"""Play some tracks"""
dtest.start_daemon()
dtest.create_user()
+ dtest.rescan() # ensure all files are scanned
c = disorder.client()
c.random_disable()
assert c.random_enabled() == False
c = disorder.client()
c.random_disable()
assert c.random_enabled() == False
@@
-65,7
+66,9
@@
def test():
print " testing scratches"
retry = False
print " testing scratches"
retry = False
- while True:
+ scratchlimit = 5
+ while scratchlimit > 0:
+ scratchlimit -= 1
c.disable()
print " starting a track"
c.play(track)
c.disable()
print " starting a track"
c.play(track)
@@
-94,6
+97,10
@@
def test():
continue
assert ts[0]['state'] == 'scratched', "checking track scratched"
break
continue
assert ts[0]['state'] == 'scratched', "checking track scratched"
break
+ if scratchlimit == 0:
+ # TODO this is really not a great approach!
+ print " didn't complete in a reasonable time"
+ sys.exit(77)
print " waiting for scratch to complete"
p = c.recent()
while p is not None:
print " waiting for scratch to complete"
p = c.recent()
while p is not None: