From 9355e9b98da1d6568fb248e6128a816a68f0af11 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Fri, 11 Feb 2011 02:52:55 +0900
Subject: [PATCH] fix sync unit tests

---
 tests/test_sync.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/test_sync.py b/tests/test_sync.py
index 3ed501b8f..f6c49cfa7 100644
--- a/tests/test_sync.py
+++ b/tests/test_sync.py
@@ -45,6 +45,9 @@ def setup_local(loadDecks=None):
         f['Front'] = u"baz"; f['Back'] = u"qux"; f.tags = u"bar"
         deck2.addFact(f)
         deck2.newCardOrder = 1
+    # normally such syncs would trigger a conflict, but we ignore it
+    deck1.setVar("schemaMod", 0)
+    deck2.setVar("schemaMod", 0)
     client = SyncClient(deck1)
     server = SyncServer(deck2)
     client.setServer(server)
@@ -120,12 +123,14 @@ def test_localsync_models():
     deck1.addModel(BasicModel())
     assert len(deck1.models) == 3
     assert len(deck2.models) == 2
+    deck1.setVar("schemaMod", 0)
     client.sync()
     assert len(deck2.models) == 3
     assert deck1.currentModel.id == deck2.currentModel.id
     # delete the recently added model
     deck2.deleteModel(deck2.currentModel)
     assert len(deck2.models) == 2
+    deck2.setVar("schemaMod", 0)
     client.sync()
     assert len(deck1.models) == 2
     assert deck1.currentModel.id == deck2.currentModel.id
@@ -142,6 +147,7 @@ def test_localsync_models():
     deck1.currentModel.setModified()
     deck1.setModified()
     assert len(deck1.currentModel.cardModels) == 1
+    deck1.setVar("schemaMod", 0)
     client.sync()
     assert len(deck2.currentModel.cardModels) == 1
     # rename a field