diff options
author | Ruben Pollan <meskio@sindominio.net> | 2015-09-10 12:19:08 +0200 |
---|---|---|
committer | Ruben Pollan <meskio@sindominio.net> | 2015-09-10 12:19:08 +0200 |
commit | cf7906eda74ad73d026f1a2a29b3581d72abb473 (patch) | |
tree | e00cbd59bd30c3820de46b2f9fa5cdaccd7c47bc /src/leap/mail/incoming/tests | |
parent | 862ed843611bbb10664e06460faee48adce9e5aa (diff) | |
parent | d4c61d7680a726227541daa13e6f72efbbd0fa2e (diff) |
Merge pixelated's X-Leap-Encryption into develop
Diffstat (limited to 'src/leap/mail/incoming/tests')
-rw-r--r-- | src/leap/mail/incoming/tests/test_incoming_mail.py | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/leap/mail/incoming/tests/test_incoming_mail.py b/src/leap/mail/incoming/tests/test_incoming_mail.py index f43f746..033799d 100644 --- a/src/leap/mail/incoming/tests/test_incoming_mail.py +++ b/src/leap/mail/incoming/tests/test_incoming_mail.py @@ -176,8 +176,22 @@ subject: independence of cyberspace d.addCallback(put_raw_key_called) return d + def testAddDecryptedHeader(self): + class DummyMsg(): + def __init__(self): + self.headers = {} + + def add_header(self, k, v): + self.headers[k] = v + + msg = DummyMsg() + self.fetcher._add_decrypted_header(msg) + + self.assertEquals(msg.headers['X-Leap-Encryption'], 'decrypted') + def testDecryptEmail(self): self.fetcher._decryption_error = Mock() + self.fetcher._add_decrypted_header = Mock() def create_encrypted_message(encstr): message = Parser().parsestr(self.EMAIL) @@ -198,9 +212,13 @@ subject: independence of cyberspace return newmsg def decryption_error_not_called(_): - self.assertFalse(self.fetcher._decyption_error.called, + self.assertFalse(self.fetcher._decryption_error.called, "There was some errors with decryption") + def add_decrypted_header_called(_): + self.assertTrue(self.fetcher._add_decrypted_header.called, + "There was some errors with decryption") + d = self._km.encrypt( self.EMAIL, ADDRESS, OpenPGPKey, sign=ADDRESS_2) |