diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-11-01 10:39:22 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-11-01 10:39:22 -0300 |
| commit | 7dc16ac9286f0383c158e6028a028d99c5b1f373 (patch) | |
| tree | 3a72f39ec1de3ea2ebbd92ed46db28fc67df8a9c /common/src/leap/soledad/common/tests/__init__.py | |
| parent | f53f40ba3b54bb8fdc418bf35d0180e26fbfd209 (diff) | |
| parent | ee02ab5518d621014903ce6ae512a969ad4a4ccd (diff) | |
Merge branch 'release-0.4.2'0.4.2
Diffstat (limited to 'common/src/leap/soledad/common/tests/__init__.py')
| -rw-r--r-- | common/src/leap/soledad/common/tests/__init__.py | 10 |
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, |