summaryrefslogtreecommitdiff
path: root/mail/src
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
commit654373d18359bcc47f50ebde376a26c51de7db11 (patch)
tree117aef5a82becbfa561b0489e42888199dd7f6c3 /mail/src
parent0f663f4fef8360d3e3f601ef06d37b9946c2faa5 (diff)
parenta0f691edc72b19cade8f05493f7743019af4d837 (diff)
Merge branch 'pixelated/fix_test_decrypt_email' into develop
Diffstat (limited to 'mail/src')
-rw-r--r--mail/src/leap/mail/incoming/tests/test_incoming_mail.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/mail/src/leap/mail/incoming/tests/test_incoming_mail.py b/mail/src/leap/mail/incoming/tests/test_incoming_mail.py
index 6267c06..c5828b7 100644
--- a/mail/src/leap/mail/incoming/tests/test_incoming_mail.py
+++ b/mail/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):