summaryrefslogtreecommitdiff
path: root/common/src/leap/soledad/common/tests/__init__.py
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-10-14 10:54:24 -0300
committerdrebs <drebs@leap.se>2013-10-28 19:18:30 -0200
commit1244f691b084b12463f88e5e0ba068432c17f621 (patch)
tree2cbd68e51bf7a6db4de38bc00067b4e2e74d081c /common/src/leap/soledad/common/tests/__init__.py
parentf6873fa53593a5fa04e733fc8f4cfbeafc4fb1ee (diff)
Add shared db locking.
* Improve bootstrap sequence: - stages are more organized. - there are less useless requests to server. * Improve shared db access: - instantiate the shared db only once. - also results in less requests to server. * Handle unicode passphrases. * Move some common functions and global variables to common. * Improve security of recovery document: - access to the recovery document now depends on the user password. * Improve documentation.
Diffstat (limited to 'common/src/leap/soledad/common/tests/__init__.py')
-rw-r--r--common/src/leap/soledad/common/tests/__init__.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/common/src/leap/soledad/common/tests/__init__.py b/common/src/leap/soledad/common/tests/__init__.py
index 9f47d74a..88f98272 100644
--- a/common/src/leap/soledad/common/tests/__init__.py
+++ b/common/src/leap/soledad/common/tests/__init__.py
@@ -60,11 +60,12 @@ class BaseSoledadTest(BaseLeapTest):
if os.path.isfile(f):
os.unlink(f)
- def _soledad_instance(self, user=ADDRESS, passphrase='123',
+ def _soledad_instance(self, user=ADDRESS, passphrase=u'123',
prefix='',
secrets_path=Soledad.STORAGE_SECRETS_FILE_NAME,
local_db_path='soledad.u1db', server_url='',
- cert_file=None, secret_id=None):
+ cert_file=None, secret_id=None,
+ shared_db_class=None):
def _put_doc_side_effect(doc):
self._doc_put = doc
@@ -73,10 +74,15 @@ class BaseSoledadTest(BaseLeapTest):
get_doc = Mock(return_value=None)
put_doc = Mock(side_effect=_put_doc_side_effect)
+ lock = Mock(return_value=('atoken', 300))
+ unlock = Mock(return_value=True)
def __call__(self):
return self
+ if shared_db_class is not None:
+ MockSharedDB = shared_db_class
+
Soledad._shared_db = MockSharedDB()
return Soledad(
user,