diff options
Diffstat (limited to 'src/mailman_pgp/pgp/tests/test_mime.py')
| -rw-r--r-- | src/mailman_pgp/pgp/tests/test_mime.py | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/src/mailman_pgp/pgp/tests/test_mime.py b/src/mailman_pgp/pgp/tests/test_mime.py index fab50bb..f56c781 100644 --- a/src/mailman_pgp/pgp/tests/test_mime.py +++ b/src/mailman_pgp/pgp/tests/test_mime.py @@ -18,6 +18,7 @@ """Tests for the MIME wrapper.""" from parameterized import parameterized +from public import public from mailman_pgp.pgp.mime import MIMEWrapper from mailman_pgp.pgp.tests.base import load_key, load_message, WrapperTestCase @@ -27,6 +28,7 @@ class MIMEWrapperTestCase(WrapperTestCase): wrapper = MIMEWrapper +@public class TestSigning(MIMEWrapperTestCase): @parameterized.expand([ (load_message('mime_signed.eml'), @@ -37,7 +39,7 @@ class TestSigning(MIMEWrapperTestCase): False) ]) def test_is_signed(self, message, signed): - super().is_signed(message, signed) + self.is_signed(message, signed) @parameterized.expand([ (load_message('clear.eml'), @@ -46,7 +48,7 @@ class TestSigning(MIMEWrapperTestCase): load_key('ecc_p256.priv.asc')) ]) def test_sign(self, message, key): - super().sign(message, key) + self.sign(message, key) @parameterized.expand([ (load_message('clear.eml'), @@ -57,7 +59,7 @@ class TestSigning(MIMEWrapperTestCase): load_key('ecc_p256.pub.asc')) ]) def test_sign_verify(self, message, priv, pub): - super().sign_verify(message, priv, pub) + self.sign_verify(message, priv, pub) @parameterized.expand([ (load_message('mime_signed.eml'), @@ -68,9 +70,10 @@ class TestSigning(MIMEWrapperTestCase): False) ]) def test_verify(self, message, key, valid): - super().verify(message, key, valid) + self.verify(message, key, valid) +@public class TestEncryption(MIMEWrapperTestCase): @parameterized.expand([ (load_message('mime_encrypted.eml'), @@ -79,7 +82,7 @@ class TestEncryption(MIMEWrapperTestCase): True) ]) def test_is_encrypted(self, message, encrypted): - super().is_encrypted(message, encrypted) + self.is_encrypted(message, encrypted) @parameterized.expand([ (load_message('clear.eml'), @@ -90,9 +93,9 @@ class TestEncryption(MIMEWrapperTestCase): ]) def test_encrypt(self, message, keys, **kwargs): if isinstance(keys, tuple): - super().encrypt(message, *keys, **kwargs) + self.encrypt(message, *keys, **kwargs) else: - super().encrypt(message, keys, **kwargs) + self.encrypt(message, keys, **kwargs) @parameterized.expand([ (load_message('clear.eml'), @@ -103,7 +106,7 @@ class TestEncryption(MIMEWrapperTestCase): load_key('ecc_p256.priv.asc')) ]) def test_encrypt_decrypt(self, message, pub, priv): - super().encrypt_decrypt(message, pub, priv) + self.encrypt_decrypt(message, pub, priv) @parameterized.expand([ (load_message('mime_encrypted.eml'), @@ -111,9 +114,10 @@ class TestEncryption(MIMEWrapperTestCase): 'Some encrypted text.\n') ]) def test_decrypt(self, message, key, clear): - super().decrypt(message, key, clear) + self.decrypt(message, key, clear) +@public class TestKeys(MIMEWrapperTestCase): @parameterized.expand([ (load_message('mime_privkey.eml'), @@ -126,7 +130,7 @@ class TestKeys(MIMEWrapperTestCase): False) ]) def test_has_keys(self, message, has_keys): - super().has_keys(message, has_keys) + self.has_keys(message, has_keys) @parameterized.expand([ (load_message('mime_privkey.eml'), @@ -135,9 +139,10 @@ class TestKeys(MIMEWrapperTestCase): [load_key('rsa_1024.pub.asc')]) ]) def test_keys(self, message, keys): - super().keys(message, keys) + self.keys(message, keys) +@public class TestCombined(MIMEWrapperTestCase): @parameterized.expand([ (load_message('clear.eml'), @@ -145,4 +150,13 @@ class TestCombined(MIMEWrapperTestCase): load_key('ecc_p256.priv.asc')) ]) def test_sign_encrypt_decrypt_verify(self, message, sign_key, encrypt_key): - super().sign_encrypt_decrypt_verify(message, sign_key, encrypt_key) + self.sign_encrypt_decrypt_verify(message, sign_key, encrypt_key) + + @parameterized.expand([ + (load_message('clear.eml'), + load_key('rsa_1024.priv.asc'), + load_key('ecc_p256.priv.asc')) + ]) + def test_sign_then_encrypt_decrypt_verify(self, message, sign_key, + encrypt_key): + self.sign_then_encrypt_decrypt_verify(message, sign_key, encrypt_key) |