~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
testing for infer_url()
[disorder]
/
tests
/
play.py
diff --git
a/tests/play.py
b/tests/play.py
index
ce5cbb1
..
0013d7e
100755
(executable)
--- a/
tests/play.py
+++ b/
tests/play.py
@@
-24,6
+24,7
@@
def test():
"""Play some tracks"""
dtest.start_daemon()
dtest.create_user()
"""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
@@
-44,11
+45,15
@@
def test():
assert c.enabled() == True
p = c.playing()
r = c.recent()
assert c.enabled() == True
p = c.playing()
r = c.recent()
+ limit = 60
while not((p is not None and p['id'] == i)
while not((p is not None and p['id'] == i)
- or (len(filter(lambda t: t['track'] == track and 'submitter' in t, r)) > 0)):
+ or (len(filter(lambda t: t['track'] == track
+ and 'submitter' in t, r)) > 0)) and limit > 0:
time.sleep(1)
p = c.playing()
r = c.recent()
time.sleep(1)
p = c.playing()
r = c.recent()
+ limit -= 1
+ assert limit > 0, "check track did complete in a reasonable time"
print " checking track turned up in recent list"
while (p is not None and p['id'] == i):
time.sleep(1)
print " checking track turned up in recent list"
while (p is not None and p['id'] == i):
time.sleep(1)
@@
-75,9
+80,12
@@
def test():
c.scratch(i)
print " waiting for track to finish"
p = c.playing()
c.scratch(i)
print " waiting for track to finish"
p = c.playing()
- while (p is not None and p['id'] == i):
+ limit = 60
+ while (p is not None and p['id'] == i) and limit > 0:
time.sleep(1)
p = c.playing()
time.sleep(1)
p = c.playing()
+ limit -= 1
+ assert limit > 0, "check track finishes in a reasonable period"
print " checking scratched track turned up in recent list"
r = c.recent()
ts = filter(lambda t: t['id'] == i, r)
print " checking scratched track turned up in recent list"
r = c.recent()
ts = filter(lambda t: t['id'] == i, r)