2 files changed, 135 insertions, 1 deletions
diff --git a/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py b/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py
index 03175cbd..49bf3bd6 100644
--- a/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py
+++ b/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py
@@ -19,7 +19,6 @@ Test sqlcipher backend sync.
 """
 
 
-import os
 import simplejson as json
 from u1db import (
     sync,
diff --git a/common/src/leap/soledad/common/tests/test_sync_mutex.py b/common/src/leap/soledad/common/tests/test_sync_mutex.py
new file mode 100644
index 00000000..89ccd75e
--- /dev/null
+++ b/common/src/leap/soledad/common/tests/test_sync_mutex.py
@@ -0,0 +1,135 @@
+# -*- coding: utf-8 -*-
+# test_sync_mutex.py
+# Copyright (C) 2013, 2014 LEAP
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+"""
+Test that synchronization is a critical section and, as such, there might not
+be two concurrent synchronization processes at the same time.
+"""
+
+
+import time
+import uuid
+import tempfile
+import shutil
+
+from urlparse import urljoin
+
+from twisted.internet import defer
+
+from leap.soledad.client.sync import SoledadSynchronizer
+
+from leap.soledad.common import couch
+from leap.soledad.common.tests.u1db_tests import TestCaseWithServer
+from leap.soledad.common.tests.test_couch import CouchDBTestCase
+
+from leap.soledad.common.tests.util import BaseSoledadTest
+from leap.soledad.common.tests.util import make_token_soledad_app
+from leap.soledad.common.tests.util import make_soledad_document_for_test
+from leap.soledad.common.tests.util import soledad_sync_target
+
+
+# monkey-patch the soledad synchronizer so it stores start and finish times
+
+_old_sync = SoledadSynchronizer.sync
+
+def _timed_sync(self, defer_decryption=True):
+    t = time.time()
+
+    sync_id = uuid.uuid4()
+
+    if not getattr(self.source, 'sync_times', False):
+        self.source.sync_times = {}
+
+
+    self.source.sync_times[sync_id] = {'start': t}
+
+    def _store_finish_time(passthrough):
+        t = time.time()
+        self.source.sync_times[sync_id]['end'] = t
+        return passthrough
+
+    d = _old_sync(self, defer_decryption=defer_decryption)
+    d.addBoth(_store_finish_time)
+    return d
+
+SoledadSynchronizer.sync = _timed_sync
+
+# -- end of monkey-patching
+
+
+class TestSyncMutex(
+        BaseSoledadTest, CouchDBTestCase, TestCaseWithServer):
+
+    @staticmethod
+    def make_app_with_state(state):
+        return make_token_soledad_app(state)
+
+    make_document_for_test = make_soledad_document_for_test
+
+    sync_target = soledad_sync_target
+
+    def make_app(self):
+        self.request_state = couch.CouchServerState(self._couch_url)
+        return self.make_app_with_state(self.request_state)
+
+    def setUp(self):
+        TestCaseWithServer.setUp(self)
+        CouchDBTestCase.setUp(self)
+        self.tempdir = tempfile.mkdtemp(prefix="leap_tests-")
+        self._couch_url = 'http://localhost:' + str(self.wrapper.port)
+
+    def tearDown(self):
+        CouchDBTestCase.tearDown(self)
+        TestCaseWithServer.tearDown(self)
+        shutil.rmtree(self.tempdir)
+
+
+    def test_two_concurrent_syncs_do_not_overlap_no_docs(self):
+        self.startServer()
+
+        # ensure remote db exists before syncing
+        db = couch.CouchDatabase.open_database(
+            urljoin(self._couch_url, 'user-user-uuid'),
+            create=True,
+            ensure_ddocs=True)
+
+        sol = self._soledad_instance(
+            user='user-uuid', server_url=self.getURL())
+
+        d1 = sol.sync()
+        d2 = sol.sync()
+
+        def _assert_syncs_do_not_overlap(thearg):
+            # recover sync times
+            sync_times = []
+            for key in sol._dbsyncer.sync_times:
+                sync_times.append(sol._dbsyncer.sync_times[key])
+            sync_times.sort(key=lambda s: s['start'])
+
+            self.assertTrue(
+                sync_times[0]['start'] < sync_times[0]['end']
+                and sync_times[0]['end'] < sync_times[1]['start']
+                and sync_times[1]['start'] < sync_times[1]['end'])
+
+            db.delete_database()
+            db.close()
+            sol.close()
+
+        d = defer.gatherResults([d1, d2])
+        d.addBoth(_assert_syncs_do_not_overlap)
+        return d