Merge config aliasing bug fix.

[disorder] / tests / files.py

diff --git a/tests/files.py b/tests/files.py
index 69e98d4f9a6df494f49c2f05f5bed72978dd343d..1edf5636c57cd833089059d466b8f5770bc08eec 100755 (executable)
--- a/tests/files.py
+++ b/tests/files.py
@@ -1,28 +1,28 @@
 #! /usr/bin/env python
 #
 # This file is part of DisOrder.
 #! /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
+# 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
 # it under the terms of the GNU General Public License as published by

-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or

 # (at your option) any later version.
 #
 # (at your option) any later version.
 #

-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 

 # You should have received a copy of the GNU General Public License
 # You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #
 import dtest,time,disorder,sys
 
 def test():
     """Check that the file listing comes out right"""
     dtest.start_daemon()
 #
 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()
     assert dtest.check_files() == 0, "dtest.check_files"
     print " checking regexp file listing"
     c = disorder.client()


@@ -30,10 +30,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
                 "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 " 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
     # 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