scripts/dist now supports chroots.

[disorder] / tests / dump.py

diff --git a/tests/dump.py b/tests/dump.py
index 84018404802b493a6a672ad3aab40d13125c08d4..b6f3d6f2c47eb43b7237ebcd153b182a3ffaf6be 100755 (executable)
--- a/tests/dump.py
+++ b/tests/dump.py
@@ -1,22 +1,20 @@
 #! /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,re
 
 #
 import dtest,time,disorder,re
 


@@ -24,6 +22,7 @@ def test():
     """Exercise database dumper"""
     dtest.start_daemon()
     dtest.create_user()
     """Exercise database dumper"""
     dtest.start_daemon()
     dtest.create_user()

+    dtest.rescan()

     c = disorder.client()
     track = "%s/Joe Bloggs/First Album/02:Second track.ogg" % dtest.tracks
     dump = "%s/dumpfile" % dtest.testroot
     c = disorder.client()
     track = "%s/Joe Bloggs/First Album/02:Second track.ogg" % dtest.tracks
     dump = "%s/dumpfile" % dtest.testroot


@@ -55,7 +54,6 @@ def test():
                          "--dump", dump])
     print " changing track pref"
     c.set(track, "foo", "after dump");
                          "--dump", dump])
     print " changing track pref"
     c.set(track, "foo", "after dump");

-    print c.get(track, "foo")

     assert c.get(track, "foo") == "after dump", "checking track foo=after dump"
     print " changing global pref"
     c.setglobal("foo", "after dump");
     assert c.get(track, "foo") == "after dump", "checking track foo=after dump"
     print " changing global pref"
     c.setglobal("foo", "after dump");