Merge more 3.0 branch changes

[disorder] / tests / dump.py

diff --git a/tests/dump.py b/tests/dump.py
index ff28c6392c5bb3ade40d3e401e57f46aefea565e..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
@@ -23,16 +23,18 @@ import dtest,time,disorder,re
 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
-    print "setting a track pref"
+    print " setting a track pref"
     c.set(track, "foo", "before")
     assert c.get(track, "foo") == "before", "checking track foo=before"
-    print "setting a global pref"
+    print " setting a global pref"
     c.setglobal("foo", "before");
     assert c.getglobal("foo") == "before", "checking global foo=before"
-    print "adding a tag"
+    print " adding a tag"
     # Exercise the tags-changed code
     c.set(track, "tags", "  first   tag, Another Tag")
     assert dtest.lists_have_same_contents(c.tags(),
@@ -42,41 +44,41 @@ def test():
     assert dtest.lists_have_same_contents(c.tags(),
                                           [u"another tag", u"wibble"]),\
            "checking tag list(2)"
-    print "checking track appears in tag search"
+    print " checking track appears in tag search"
     tracks = c.search(["tag:wibble"])
     assert len(tracks) == 1, "checking there is exactly one search result(1)"
     assert tracks[0] == track, "checking for right search result(1)"
     tracks = c.search(["tag:  another    tAg  "])
     assert len(tracks) == 1, "checking there is exactly one search result(2)"
     assert tracks[0] == track, "checking for right search result(2)"
-    print "dumping database"
+    print " dumping database"
     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"
-    print "changing global pref"
-    c.setglobal("foo", "after");
-    assert c.getglobal("foo") == "after", "checking global foo=before"
-    print "adding fresh track pref"
-    c.set(track, "bar", "after")
-    print "adding fresh global pref"
-    c.setglobal("bar", "after")
+    print " changing track pref"
+    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 dump");
+    assert c.getglobal("foo") == "after dump", "checking global foo=after dump"
+    print " adding fresh track pref"
+    c.set(track, "bar", "after dump")
+    print " adding fresh global pref"
+    c.setglobal("bar", "after dump")
     dtest.stop_daemon();
     print "restoring database"
     print dtest.command(["disorder-dump", "--config", disorder._configfile,
                          "--undump", dump])
     dtest.start_daemon(); 
     c = disorder.client()
-    print "checking track pref"
+    print " checking track pref"
     assert c.get(track, "foo") == "before", "checking track foo=before after undump"
-    print "checking global pref"
+    print " checking global pref"
     assert c.getglobal("foo") == "before", "checking global foo=before after undump"
-    print "checking fresh track pref"
+    print " checking fresh track pref"
     assert c.get(track, "bar") is None, "checking fresh track pref has gone"
-    print "checking fresh global pref"
+    print " checking fresh global pref"
     assert c.getglobal("bar") is None, "checking fresh global pref has gone"
-    print "checking tag search still works"
+    print " checking tag search still works"
     tracks = c.search(["tag:wibble"])
     assert len(tracks) == 1, "checking there is exactly one search result"
     assert tracks[0] == track, "checking for right search result(3)"