disorder-udplog exits more reliably when parent dies

[disorder] / tests / play.py

diff --git a/tests/play.py b/tests/play.py
index cbbb0ec10313f02ef205fcedf9234655528f1b39..92bb6649dfc5c248cd0f3f2d71616cbedf148600 100755 (executable)
--- a/tests/play.py
+++ b/tests/play.py
@@ -27,14 +27,14 @@ def test():
     track = u"%s/Joe Bloggs/First Album/02:Second track.ogg" % dtest.tracks
     print "adding track to queue"
     c.play(track)
     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)
     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']
     t = ts[0]
     assert t['submitter'] == u'fred', "check queue submitter"
     i = t['id']

-    print "waiting for track"
+    print " waiting for track"

     p = c.playing()
     r = c.recent()
     while not((p is not None and p['id'] == i)
     p = c.playing()
     r = c.recent()
     while not((p is not None and p['id'] == i)


@@ -42,14 +42,34 @@ def test():
         time.sleep(1)
         p = c.playing()
         r = c.recent()
         time.sleep(1)
         p = c.playing()
         r = c.recent()

-    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
+    print " checking 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['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"
     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()
 
 if __name__ == '__main__':
     dtest.run()