1 files changed, 34 insertions, 4 deletions

diff --git a/src/mailman_pgp/pgp/tests/test_mime.py b/src/mailman_pgp/pgp/tests/test_mime.py
index b45d924..5d983b8 100644
--- a/src/mailman_pgp/pgp/tests/test_mime.py
+++ b/src/mailman_pgp/pgp/tests/test_mime.py
@@ -34,15 +34,30 @@ class TestSigning(MIMEWrapperTestCase):
         (load_message('mime_signed_invalid.eml'),
          True),
         (load_message('clear.eml'),
+         False),
+        (load_message('clear_multipart.eml'),
          False)
     ])
     def test_is_signed(self, message, signed):
         self.is_signed(message, signed)
 
     @parameterized.expand([
+        (load_message('mime_signed.eml'),
+         True),
+        (load_message('mime_signed_invalid.eml'),
+         True),
         (load_message('clear.eml'),
-         load_key('rsa_1024.priv.asc')),
+         False),
+        (load_message('clear_multipart.eml'),
+         False)
+    ])
+    def test_has_signature(self, message, has):
+        self.has_signature(message, has)
+
+    @parameterized.expand([
         (load_message('clear.eml'),
+         load_key('rsa_1024.priv.asc')),
+        (load_message('clear_multipart.eml'),
          load_key('ecc_p256.priv.asc'))
     ])
     def test_sign(self, message, key):
@@ -52,7 +67,7 @@ class TestSigning(MIMEWrapperTestCase):
         (load_message('clear.eml'),
          load_key('rsa_1024.priv.asc'),
          load_key('rsa_1024.pub.asc')),
-        (load_message('clear.eml'),
+        (load_message('clear_multipart.eml'),
          load_key('ecc_p256.priv.asc'),
          load_key('ecc_p256.pub.asc'))
     ])
@@ -82,9 +97,18 @@ class TestEncryption(MIMEWrapperTestCase):
         self.is_encrypted(message, encrypted)
 
     @parameterized.expand([
+        (load_message('mime_encrypted.eml'),
+         True),
+        (load_message('mime_encrypted_then_signed.eml'),
+         True)
+    ])
+    def test_has_encryption(self, message, has):
+        self.has_encryption(message, has)
+
+    @parameterized.expand([
         (load_message('clear.eml'),
          load_key('rsa_1024.pub.asc')),
-        (load_message('clear.eml'),
+        (load_message('clear_multipart.eml'),
          (load_key('rsa_1024.pub.asc'),
           load_key('ecc_p256.pub.asc')))
     ])
@@ -98,7 +122,7 @@ class TestEncryption(MIMEWrapperTestCase):
         (load_message('clear.eml'),
          load_key('rsa_1024.pub.asc'),
          load_key('rsa_1024.priv.asc')),
-        (load_message('clear.eml'),
+        (load_message('clear_multipart.eml'),
          load_key('ecc_p256.pub.asc'),
          load_key('ecc_p256.priv.asc'))
     ])
@@ -142,6 +166,9 @@ class TestCombined(MIMEWrapperTestCase):
     @parameterized.expand([
         (load_message('clear.eml'),
          load_key('rsa_1024.priv.asc'),
+         load_key('ecc_p256.priv.asc')),
+        (load_message('clear_multipart.eml'),
+         load_key('rsa_1024.priv.asc'),
          load_key('ecc_p256.priv.asc'))
     ])
     def test_sign_encrypt_decrypt_verify(self, message, sign_key, encrypt_key):
@@ -150,6 +177,9 @@ class TestCombined(MIMEWrapperTestCase):
     @parameterized.expand([
         (load_message('clear.eml'),
          load_key('rsa_1024.priv.asc'),
+         load_key('ecc_p256.priv.asc')),
+        (load_message('clear_multipart.eml'),
+         load_key('rsa_1024.priv.asc'),
          load_key('ecc_p256.priv.asc'))
     ])
     def test_sign_then_encrypt_decrypt_verify(self, message, sign_key,