Use users.db. trackdb* moves to lib/, as it's now used by client.c to

[disorder] / tests / dump.py

diff --git a/tests/dump.py b/tests/dump.py
index ff28c6392c5bb3ade40d3e401e57f46aefea565e..f3122c237e4399f4897ac8380aa9ddeaa43b658f 100755 (executable)
--- a/tests/dump.py
+++ b/tests/dump.py
@@ -23,16 +23,17 @@ import dtest,time,disorder,re
 def test():
     """Exercise database dumper"""
     dtest.start_daemon()
 def test():
     """Exercise database dumper"""
     dtest.start_daemon()

+    dtest.create_user()

     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

-    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"
     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"
     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(),
     # Exercise the tags-changed code
     c.set(track, "tags", "  first   tag, Another Tag")
     assert dtest.lists_have_same_contents(c.tags(),


@@ -42,25 +43,25 @@ def test():
     assert dtest.lists_have_same_contents(c.tags(),
                                           [u"another tag", u"wibble"]),\
            "checking tag list(2)"
     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)"
     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 dtest.command(["disorder-dump", "--config", disorder._configfile,
                          "--dump", dump])

-    print "changing track pref"
+    print " changing track pref"

     c.set(track, "foo", "after");
     assert c.get(track, "foo") == "after", "checking track foo=before"
     c.set(track, "foo", "after");
     assert c.get(track, "foo") == "after", "checking track foo=before"

-    print "changing global pref"
+    print " changing global pref"

     c.setglobal("foo", "after");
     assert c.getglobal("foo") == "after", "checking global foo=before"
     c.setglobal("foo", "after");
     assert c.getglobal("foo") == "after", "checking global foo=before"

-    print "adding fresh track pref"
+    print " adding fresh track pref"

     c.set(track, "bar", "after")
     c.set(track, "bar", "after")

-    print "adding fresh global pref"
+    print " adding fresh global pref"

     c.setglobal("bar", "after")
     dtest.stop_daemon();
     print "restoring database"
     c.setglobal("bar", "after")
     dtest.stop_daemon();
     print "restoring database"


@@ -68,15 +69,15 @@ def test():
                          "--undump", dump])
     dtest.start_daemon(); 
     c = disorder.client()
                          "--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"
     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"
     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"
     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"
     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)"
     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)"