Merge latest Disobedience changes

[disorder] / tests / search.py

diff --git a/tests/search.py b/tests/search.py
index 3be6ec932a0074f73713beacdde9de18c80c093d..5e3d2008c7deb0d8231a48810905844816e7495a 100755 (executable)
--- a/tests/search.py
+++ b/tests/search.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 #
 # This file is part of DisOrder.
-# Copyright (C) 2007 Richard Kettlewell
+# Copyright (C) 2007, 2008 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@ def test():
     """Check that the search produces the right results"""
     dtest.start_daemon()
     dtest.create_user()
-    time.sleep(2)                       # give rescan a chance
+    dtest.rescan()
     global client
     client = disorder.client()
     first = ["Joe Bloggs/First Album/01:F\xC3\x8Crst track.ogg",
@@ -89,6 +89,8 @@ def test():
     check_search_results([u"fi\u0300rst"], first)
     check_search_results([u"THI\u0301RD"], third)
     check_search_results([u"thI\u0301rd"], third)
+    # stopwords shouldn't show up
+    check_search_results(["01"], [])
     
     if failures > 0:
         sys.exit(1)