summaryrefslogtreecommitdiff
path: root/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
commit805fb42e1726acd08597eddc588cc1d4a2c6da56 (patch)
tree1907fd8896bb3329e606af5c795c9224a9b0d175 /mail
parent0a7cc921ed8dce021c76497cc436ed7878a6e2fb (diff)
parentea5d20bc1c8fa3a137cc54d8faa0294f5014d959 (diff)
Merge branch 'fix_tests' into develop
Diffstat (limited to 'mail')
-rw-r--r--mail/pkg/requirements-latest.pip2
-rw-r--r--mail/src/leap/mail/generator.py1
-rw-r--r--mail/src/leap/mail/tests/__init__.py2
3 files changed, 5 insertions, 0 deletions
diff --git a/mail/pkg/requirements-latest.pip b/mail/pkg/requirements-latest.pip
index 846a319..f561d4e 100644
--- a/mail/pkg/requirements-latest.pip
+++ b/mail/pkg/requirements-latest.pip
@@ -1,5 +1,7 @@
--index-url https://pypi.python.org/simple/
+pycryptopp
+
--allow-external u1db --allow-unverified u1db
--allow-external dirspec --allow-unverified dirspec
-e 'git+https://github.com/pixelated-project/leap_pycommon.git@develop#egg=leap.common'
diff --git a/mail/src/leap/mail/generator.py b/mail/src/leap/mail/generator.py
index 28db8da..7028817 100644
--- a/mail/src/leap/mail/generator.py
+++ b/mail/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/mail/src/leap/mail/tests/__init__.py b/mail/src/leap/mail/tests/__init__.py
index 71452d2..8094c11 100644
--- a/mail/src/leap/mail/tests/__init__.py
+++ b/mail/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)