summaryrefslogtreecommitdiff
path: root/src/leap/mail/smtp/tests/__init__.py
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-11-07 16:44:59 -0200
committerdrebs <drebs@leap.se>2013-11-07 16:44:59 -0200
commit4df74038a89dccff213c07795795154831330ace (patch)
tree563633aba5268d70c16468bfa042a47fef7b688b /src/leap/mail/smtp/tests/__init__.py
parent9b8265b2a5f4a19d844b4d0d474e079f3338f68a (diff)
Cleanup code and fix tests.
Diffstat (limited to 'src/leap/mail/smtp/tests/__init__.py')
-rw-r--r--src/leap/mail/smtp/tests/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/leap/mail/smtp/tests/__init__.py b/src/leap/mail/smtp/tests/__init__.py
index 9b54de3..ee6de9b 100644
--- a/src/leap/mail/smtp/tests/__init__.py
+++ b/src/leap/mail/smtp/tests/__init__.py
@@ -59,7 +59,7 @@ class TestCaseWithKeyManager(BaseLeapTest):
# setup our own stuff
address = 'leap@leap.se' # user's address in the form user@provider
uuid = 'leap@leap.se'
- passphrase = '123'
+ passphrase = u'123'
secrets_path = os.path.join(self.tempdir, 'secret.gpg')
local_db_path = os.path.join(self.tempdir, 'soledad.u1db')
server_url = 'http://provider/'
@@ -88,6 +88,8 @@ class TestCaseWithKeyManager(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