summaryrefslogtreecommitdiff
path: root/common/src/leap/soledad/common/tests/util.py
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2015-08-17 13:48:09 -0300
committerKali Kaneko <kali@leap.se>2015-08-17 19:09:08 -0400
commitc594128dec8481b75b0610dcbd96627deae1d650 (patch)
treeb53838f283cff6629effbf15e0c6088c513bcedd /common/src/leap/soledad/common/tests/util.py
parentd5970ffb6c42d93c64b0abd2ac6274110fd65ed3 (diff)
[tests] fix test_sync_deferred test
* Add possibility of passing sync_db and sync_enc_pool to target creation. * Ensure defer_encryption and defer_decryption are True when setting up the test environment.
Diffstat (limited to 'common/src/leap/soledad/common/tests/util.py')
-rw-r--r--common/src/leap/soledad/common/tests/util.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/common/src/leap/soledad/common/tests/util.py b/common/src/leap/soledad/common/tests/util.py
index d42edf18..910a8d54 100644
--- a/common/src/leap/soledad/common/tests/util.py
+++ b/common/src/leap/soledad/common/tests/util.py
@@ -175,7 +175,9 @@ class MockedSharedDBTest(object):
return defaultMockSharedDB
-def soledad_sync_target(test, path, source_replica_uid=uuid4().hex):
+def soledad_sync_target(
+ test, path, source_replica_uid=uuid4().hex,
+ sync_db=None, sync_enc_pool=None):
creds = {'token': {
'uuid': 'user-uuid',
'token': 'auth-token',
@@ -185,7 +187,9 @@ def soledad_sync_target(test, path, source_replica_uid=uuid4().hex):
source_replica_uid,
creds,
test._soledad._crypto,
- None)
+ None, # cert_file
+ sync_db=sync_db,
+ sync_enc_pool=sync_enc_pool)
# redefine the base leap test class so it inherits from twisted trial's