X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/bf219db9f91e923842dd54d6534156c92a583c8a..15a66a1380c40c0f711e88e5863f9bed1347d2df:/tests/play.py

diff --git a/tests/play.py b/tests/play.py
index 43deaff..c298ce5 100755
--- a/tests/play.py
+++ b/tests/play.py
@@ -18,12 +18,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 #
-import dtest,time,disorder,re
+import dtest,time,disorder,re,sys
 
 def test():
     """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
@@ -65,7 +66,9 @@ def test():
 
     print " testing scratches"
     retry = False
-    while True:
+    scratchlimit = 5
+    while scratchlimit > 0:
+        scratchlimit -= 1
         c.disable()
         print " starting a track"
         c.play(track)
@@ -94,6 +97,10 @@ def test():
             continue
         assert ts[0]['state'] == 'scratched', "checking track scratched"
         break
+    if scratchlimit == 0:
+        # TODO this is really not a great approach!
+        print " didn't complete in a reasonable time"
+        sys.exit(77)
     print " waiting for scratch to complete"
     p = c.recent()
     while p is not None: