summaryrefslogtreecommitdiff
path: root/src/leap/soledad/tests/__init__.py
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-05-21 20:33:48 -0300
committerdrebs <drebs@leap.se>2013-05-21 21:42:56 -0300
commit6c1b204938109de29fa53cc4e445b822f622826d (patch)
tree457528cd657c4201fd9e9ca2c4c73976e1c0a73e /src/leap/soledad/tests/__init__.py
parentb86442d9ae23b91e81bcfa2d82ed90638f849578 (diff)
Improve _has_secret() logic and tests.
Diffstat (limited to 'src/leap/soledad/tests/__init__.py')
-rw-r--r--src/leap/soledad/tests/__init__.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/leap/soledad/tests/__init__.py b/src/leap/soledad/tests/__init__.py
index 79ee69c4..00de687b 100644
--- a/src/leap/soledad/tests/__init__.py
+++ b/src/leap/soledad/tests/__init__.py
@@ -48,7 +48,7 @@ class BaseSoledadTest(BaseLeapTest):
prefix='',
secrets_path=Soledad.STORAGE_SECRETS_FILE_NAME,
local_db_path='/soledad.u1db', server_url='',
- cert_file=None):
+ cert_file=None, secret_id=None):
def _put_doc_side_effect(doc):
self._doc_put = doc
@@ -68,7 +68,8 @@ class BaseSoledadTest(BaseLeapTest):
secrets_path=self.tempdir+prefix+secrets_path,
local_db_path=self.tempdir+prefix+local_db_path,
server_url=server_url, # Soledad will fail if not given an url.
- cert_file=cert_file)
+ cert_file=cert_file,
+ secret_id=secret_id)
def assertGetEncryptedDoc(
self, db, doc_id, doc_rev, content, has_conflicts):