From 0ef3fe5d75631cd4f507cca9bc5e9be852db03cb Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Wed, 7 Dec 2011 23:23:58 +0900
Subject: [PATCH] fix media unittest, turn of sync during upgrade

---
 anki/upgrade.py     |  1 +
 tests/test_media.py | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/anki/upgrade.py b/anki/upgrade.py
index 79fe9f80d..d0ca3c885 100644
--- a/anki/upgrade.py
+++ b/anki/upgrade.py
@@ -132,6 +132,7 @@ and c.ordinal != cm.ordinal"""):
         # speed up the upgrade
         db.execute("pragma temp_store = memory")
         db.execute("pragma cache_size = 10000")
+        db.execute("pragma synchronous = off")
         # these weren't always correctly set
         db.execute("pragma page_size = 4096")
         db.execute("pragma legacy_file_format = 0")
diff --git a/tests/test_media.py b/tests/test_media.py
index 72cf564fc..735482757 100644
--- a/tests/test_media.py
+++ b/tests/test_media.py
@@ -63,7 +63,9 @@ def test_deckIntegration():
 def test_changes():
     d = getEmptyDeck()
     assert d.media._changed()
-    assert not list(d.media.added())
+    def added():
+        return d.media.db.execute("select fname from log where type = 0")
+    assert not list(added())
     assert not list(d.media.removed())
     # add a file
     dir = tempfile.mkdtemp(prefix="anki")
@@ -72,24 +74,23 @@ def test_changes():
     time.sleep(1)
     path = d.media.addFile(path)
     # should have been logged
-    assert list(d.media.added())
+    d.media.findChanges()
+    assert list(added())
     assert not list(d.media.removed())
     # if we modify it, the cache won't notice
     time.sleep(1)
     open(path, "w").write("world")
-    assert len(list(d.media.added())) == 1
+    assert len(list(added())) == 1
     assert not list(d.media.removed())
     # but if we add another file, it will
     time.sleep(1)
     open(path+"2", "w").write("yo")
-    assert len(list(d.media.added())) == 2
+    d.media.findChanges()
+    assert len(list(added())) == 2
     assert not list(d.media.removed())
     # deletions should get noticed too
     time.sleep(1)
     os.unlink(path+"2")
-    assert len(list(d.media.added())) == 1
+    d.media.findChanges()
+    assert len(list(added())) == 1
     assert len(list(d.media.removed())) == 1
-    # after a sync completes, it clears the log
-    d.media.clearLog()
-    assert len(list(d.media.added())) == 0
-    assert len(list(d.media.removed())) == 0