From f15cb23c416a49244d7be285446f976edd3740ac Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Fri, 9 Sep 2011 21:17:42 +0900
Subject: [PATCH] skip the 600 second pad during testing

---
 anki/sync.py       | 5 ++++-
 tests/test_sync.py | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/anki/sync.py b/anki/sync.py
index d11cea495..06270c5af 100644
--- a/anki/sync.py
+++ b/anki/sync.py
@@ -68,7 +68,7 @@ class Syncer(object):
         elif lscm != rscm:
             return "fullSync"
         # find last sync time minus 10 mins for clock drift
-        self.ls = min(lsyn, rsyn) - 600
+        self.ls = self._lastSync(lsyn, rsyn)
         self.lnewer = self.lmod > self.rmod
         # get local changes and switch to full sync if there were too many
         self.status("getLocal")
@@ -89,6 +89,9 @@ class Syncer(object):
         self.finish(mod)
         return "success"
 
+    def _lastSync(self, lsyn, rsyn):
+        return min(lsyn, rsyn) - 600
+
     def times(self):
         return (self.deck.mod, self.deck.scm, self.deck.lastSync)
 
diff --git a/tests/test_sync.py b/tests/test_sync.py
index 1b1c87c91..04ae3309a 100644
--- a/tests/test_sync.py
+++ b/tests/test_sync.py
@@ -45,6 +45,10 @@ def setup_basic(loadDecks=None):
         deck1.save(); deck2.save()
     server = LocalServer(deck2)
     client = Syncer(deck1, server)
+    # for testing, don't add the 10 minute padding
+    def _lastSync(lsyn, rsyn):
+        return min(lsyn, rsyn)
+    client._lastSync = _lastSync
 
 def setup_modified():
     setup_basic()
@@ -77,6 +81,7 @@ def test_sync():
     # last sync times and mod times should agree
     assert deck1.mod == deck2.mod
     assert deck1.lastSync == deck2.lastSync
+    assert deck1.mod == deck1.lastSync
     assert deck1.lastSync != origLs
     # because everything was created separately it will be merged in. in
     # actual use we use a full sync to ensure initial a common starting point.
@@ -119,7 +124,9 @@ def test_facts():
     assert client.sync() == "success"
     assert deck2.getFact(fid)['Front'] == "abc"
     # deletions too
+    assert deck1.db.scalar("select 1 from facts where id = ?", fid)
     deck1.remFacts([fid])
+    deck1.lastSync = deck2.lastSync = intTime() - 1
     deck1.save(mod=intTime()+1)
     assert client.sync() == "success"
     assert not deck1.db.scalar("select 1 from facts where id = ?", fid)