exercise make_home()

[disorder] / tests / files.py

diff --git a/tests/files.py b/tests/files.py
index 7c22ffcede5d49d9206969a180b17b8a12965a91..984c6cca89dd839d05e26f10112aada72b96a592 100755 (executable)
--- a/tests/files.py
+++ b/tests/files.py
@@ -1,7 +1,7 @@
 #! /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
 # it under the terms of the GNU General Public License as published by
 #
 # 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


@@ -24,6 +24,7 @@ def test():
     """Check that the file listing comes out right"""
     dtest.start_daemon()
     dtest.create_user()
     """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()


@@ -31,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
                 "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