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/smtp/tests/__init__.py | |
| 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/smtp/tests/__init__.py')
| -rw-r--r-- | src/leap/mail/smtp/tests/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/leap/mail/smtp/tests/__init__.py b/src/leap/mail/smtp/tests/__init__.py index 9b54de3..62b015f 100644 --- a/src/leap/mail/smtp/tests/__init__.py +++ b/src/leap/mail/smtp/tests/__init__.py @@ -17,7 +17,7 @@ """ -Base classes and keys for SMTP relay tests. +Base classes and keys for SMTP gateway tests. """ import os @@ -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 |