X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/71b70599a2cd81c13cc4326499a5d0c45358cd7d..fc80bbcd268a28efc9869666d3a8dc078c300b58:/tests/files.py

diff --git a/tests/files.py b/tests/files.py
index 69e98d4..984c6cc 100755
--- a/tests/files.py
+++ b/tests/files.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
@@ -23,6 +23,8 @@ import dtest,time,disorder,sys
 def test():
     """Check that the file listing comes out right"""
     dtest.start_daemon()
+    dtest.create_user()
+    dtest.rescan()
     assert dtest.check_files() == 0, "dtest.check_files"
     print " checking regexp file listing"
     c = disorder.client()
@@ -30,10 +32,19 @@ def test():
                 "second")
     assert len(f) == 1, "checking for one match"
     assert f[0] == "%s/Joe Bloggs/First Album/02:Second track.ogg" % dtest.tracks
+    print " and again to exercise cache"
+    f = c.files("%s/Joe Bloggs/First Album" % dtest.tracks,
+                "second")
+    assert len(f) == 1, "checking for one match"
+    assert f[0] == "%s/Joe Bloggs/First Album/02:Second track.ogg" % dtest.tracks
     print " checking unicode regexp file listing"
     f = c.files("%s/Joe Bloggs/First Album" % dtest.tracks,
                 "first")
     assert len(f) == 0, "checking for 0 matches"
+    print " and again to exercise cache"
+    f = c.files("%s/Joe Bloggs/First Album" % dtest.tracks,
+                "first")
+    assert len(f) == 0, "checking for 0 matches"
     # This is rather unsatisfactory but it is the current behavior.  We could
     # for instance go to NFD for regexp matching but we'd have to do the same
     # to the regexp, including replacing single characters with (possibly