summaryrefslogtreecommitdiff
path: root/src/leap/mail
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2016-02-09 16:38:57 +0100
committerRuben Pollan <meskio@sindominio.net>2016-02-09 16:38:57 +0100
commit6b08e8c98b66440e3b583818c2ead1e01f2f3679 (patch)
tree00675ceb6722593d74a6e7bacafa9fbc2c7205c4 /src/leap/mail
parentdef352848b88dd8445bfca8e4c092134b8c4d5b2 (diff)
parent27f1a84897bf60135820a99f92bfdd36e97450e5 (diff)
Merge branch 'fix_tests' into develop
Diffstat (limited to 'src/leap/mail')
-rw-r--r--src/leap/mail/generator.py1
-rw-r--r--src/leap/mail/tests/__init__.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/leap/mail/generator.py b/src/leap/mail/generator.py
index 28db8da..7028817 100644
--- a/src/leap/mail/generator.py
+++ b/src/leap/mail/generator.py
@@ -1,5 +1,6 @@
from email.generator import Generator as EmailGenerator
+
class Generator(EmailGenerator):
"""
Generates output from a Message object tree, keeping signatures.
diff --git a/src/leap/mail/tests/__init__.py b/src/leap/mail/tests/__init__.py
index 71452d2..8094c11 100644
--- a/src/leap/mail/tests/__init__.py
+++ b/src/leap/mail/tests/__init__.py
@@ -94,6 +94,8 @@ class TestCaseWithKeyManager(unittest.TestCase, BaseLeapTest):
gpgbinary=self.GPG_BINARY_PATH)
self._km._fetcher.put = Mock()
self._km._fetcher.get = Mock(return_value=Response())
+ self._km._async_client.request = Mock(return_value="")
+ self._km._async_client_pinned.request = Mock(return_value="")
d1 = self._km.put_raw_key(PRIVATE_KEY, OpenPGPKey, ADDRESS)
d2 = self._km.put_raw_key(PRIVATE_KEY_2, OpenPGPKey, ADDRESS_2)