Merge more 3.0 branch changes

[disorder] / tests / dump.py

diff --git a/tests/dump.py b/tests/dump.py
index f3122c237e4399f4897ac8380aa9ddeaa43b658f..ff28a0ffc32001c3187f723dbd546f22e4a1dd41 100755 (executable)
--- a/tests/dump.py
+++ b/tests/dump.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
@@ -24,6 +24,7 @@ def test():
     """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
@@ -54,15 +55,15 @@ def test():
     print dtest.command(["disorder-dump", "--config", disorder._configfile,
                          "--dump", dump])
     print " changing track pref"
-    c.set(track, "foo", "after");
-    assert c.get(track, "foo") == "after", "checking track foo=before"
+    c.set(track, "foo", "after dump");
+    assert c.get(track, "foo") == "after dump", "checking track foo=after dump"
     print " changing global pref"
-    c.setglobal("foo", "after");
-    assert c.getglobal("foo") == "after", "checking global foo=before"
+    c.setglobal("foo", "after dump");
+    assert c.getglobal("foo") == "after dump", "checking global foo=after dump"
     print " adding fresh track pref"
-    c.set(track, "bar", "after")
+    c.set(track, "bar", "after dump")
     print " adding fresh global pref"
-    c.setglobal("bar", "after")
+    c.setglobal("bar", "after dump")
     dtest.stop_daemon();
     print "restoring database"
     print dtest.command(["disorder-dump", "--config", disorder._configfile,