Limit how long tests/play.py will wait

diff --git a/tests/play.py b/tests/play.py
index ce5cbb1c6d05aac0fc4f0b5e73d83cb02f65d326..43deaff7dc9d04c794fc99957e8cec0190b7b19a 100755 (executable)
--- a/tests/play.py
+++ b/tests/play.py
@@ -44,11 +44,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 +79,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)