diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-11-11 12:07:53 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-11-11 12:07:53 -0300 |
| commit | 9d89cc58ad8ddd10a198b168cf1005f41e93ca58 (patch) | |
| tree | 7ab1b60885b460ba9b824aad42a147b5619c05aa /src/leap/mail/imap | |
| parent | 9112713112a05f0de480e43ff5ebc2a17e95b45e (diff) | |
| parent | 275c435ee45463ed6011f8988d5c7f90cb42fd01 (diff) | |
Merge remote-tracking branch 'drebs/feature/4324_prevent-double-encryption-when-relaying-2' into develop
Diffstat (limited to 'src/leap/mail/imap')
| -rw-r--r-- | src/leap/mail/imap/tests/test_imap.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/leap/mail/imap/tests/test_imap.py b/src/leap/mail/imap/tests/test_imap.py index 3411795..ad11315 100644 --- a/src/leap/mail/imap/tests/test_imap.py +++ b/src/leap/mail/imap/tests/test_imap.py @@ -91,7 +91,7 @@ def initialize_soledad(email, gnupg_home, tempdir): """ uuid = "foobar-uuid" - passphrase = "verysecretpassphrase" + passphrase = u"verysecretpassphrase" secret_path = os.path.join(tempdir, "secret.gpg") local_db_path = os.path.join(tempdir, "soledad.u1db") server_url = "http://provider" @@ -101,6 +101,8 @@ def initialize_soledad(email, gnupg_home, tempdir): get_doc = Mock(return_value=None) put_doc = Mock() + lock = Mock(return_value=('atoken', 300)) + unlock = Mock(return_value=True) def __call__(self): return self |