disorder-udplog exits more reliably when parent dies

[disorder] / tests / play.py

diff --git a/tests/play.py b/tests/play.py
index b02ffce3178b8ff32f183093937a5100d3935a1b..92bb6649dfc5c248cd0f3f2d71616cbedf148600 100755 (executable)
--- a/tests/play.py
+++ b/tests/play.py
@@ -27,31 +27,49 @@ def test():
     track = u"%s/Joe Bloggs/First Album/02:Second track.ogg" % dtest.tracks
     print "adding track to queue"
     c.play(track)
-    print "checking track turned up in queue"
+    print " checking track turned up in queue"
     q = c.queue()
     ts = filter(lambda t: t['track'] == track and 'submitter' in t, q)
-    assert len(ts) == 1
+    assert len(ts) == 1, "checking track appears exactly once in queue"
     t = ts[0]
     assert t['submitter'] == u'fred', "check queue submitter"
     i = t['id']
-    print "waiting for track to play"
+    print " waiting for track"
     p = c.playing()
-    while p is None or p['id'] != i:
+    r = c.recent()
+    while not((p is not None and p['id'] == i)
+              or (len(filter(lambda t: t['track'] == track and 'submitter' in t, r)) > 0)):
         time.sleep(1)
         p = c.playing()
-    print "waiting for track to finish"
-    p = c.playing()
-    while p is not None and p['id'] == i:
+        r = c.recent()
+    print " checking track turned up in recent list"
+    while (p is not None and p['id'] == i):
         time.sleep(1)
         p = c.playing()
-    print "checking track turned up in recent list"
-    q = c.recent()
-    ts = filter(lambda t: t['track'] == track and 'submitter' in t, q)
-    assert len(ts) == 1
+    r = c.recent()
+    ts = filter(lambda t: t['track'] == track and 'submitter' in t, r)
+    assert len(ts) == 1, "check track appears exactly once in recent"
     t = ts[0]
     assert t['submitter'] == u'fred', "check recent entry submitter"
-    
-        
+    print " disabling play"
+    c.disable()
+    print " scratching current track"
+    p = c.playing()
+    i = p['id']
+    c.scratch(i)
+    print " checking scratched track turned up in recent list"
+    while (p is not None and p['id'] == i):
+        time.sleep(1)
+        p = c.playing()
+    r = c.recent()
+    ts = filter(lambda t: t['id'] == i, r)
+    assert len(ts) == 1, "check scratched track appears exactly once in recent"
+    assert ts[0]['state'] == 'scratched', "checking track scratched"
+    print " waiting for scratch to complete"
+    while (p is not None and p['state'] == 'isscratch'):
+        time.sleep(1)
+        p = c.playing()
+    assert p is None, "checking nothing is playing"
 
 if __name__ == '__main__':
     dtest.run()