'cookie' response now includes the username.

[disorder] / tests / play.py

diff --git a/tests/play.py b/tests/play.py
index 96cc2fd986d9d9be4a6d458d3e314bf49ccb9aec..9292dfc8bcdb71679017c6031f0b79fda6996094 100755 (executable)
--- a/tests/play.py
+++ b/tests/play.py
@@ -23,9 +23,10 @@ import dtest,time,disorder,re
 def test():
     """Play some tracks"""
     dtest.start_daemon()
+    dtest.create_user()
     c = disorder.client()
     track = u"%s/Joe Bloggs/First Album/02:Second track.ogg" % dtest.tracks
-    print "adding track to queue"
+    print " adding track to queue"
     c.play(track)
     print " checking track turned up in queue"
     q = c.queue()
@@ -51,6 +52,8 @@ def test():
     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']
@@ -63,6 +66,11 @@ def test():
     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()