summaryrefslogtreecommitdiff
path: root/src/leap/mail/imap/tests
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-11-15 10:14:17 -0300
committerTomás Touceda <chiiph@leap.se>2013-11-15 10:14:17 -0300
commit46ccf635c44aeffb75c95845b8b4cc9ce2b1c4a4 (patch)
tree7cea49baa78064599bdb92ca81917c88ad35267a /src/leap/mail/imap/tests
parente04a13bf4dd57b18d1e627d8dabdb26f5a6531b6 (diff)
parent297dfda10617cb7c30aca11c55771c1d60948c6d (diff)
Merge branch 'release-0.3.7'0.3.7
Diffstat (limited to 'src/leap/mail/imap/tests')
-rw-r--r--src/leap/mail/imap/tests/test_imap.py4
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