summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2016-06-07 21:02:17 +0200
committerRuben Pollan <meskio@sindominio.net>2016-06-07 21:02:17 +0200
commitc3ecebbd26637e628047d71cd1ddd9338efbdc60 (patch)
treee5128fe01440eb23fce3115479bdccb26b6b7f6c /src/leap
parent75f046b5c23ad34ed50ae3d7b97abe93a5db079c (diff)
parent736edc16f5ce9d977586d25d60f423ac9d847b15 (diff)
Merge branch 'pixelated/fix_test_decrypt_email' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/mail/incoming/tests/test_incoming_mail.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/leap/mail/incoming/tests/test_incoming_mail.py b/src/leap/mail/incoming/tests/test_incoming_mail.py
index 6267c06..c5828b7 100644
--- a/src/leap/mail/incoming/tests/test_incoming_mail.py
+++ b/src/leap/mail/incoming/tests/test_incoming_mail.py
@@ -290,6 +290,8 @@ subject: independence of cyberspace
d.addCallback(
lambda message:
self._do_fetch(message.as_string()))
+ d.addCallback(decryption_error_not_called)
+ d.addCallback(add_decrypted_header_called)
return d
def testListener(self):