1 files changed, 48 insertions, 4 deletions

diff --git a/src/mailman_pgp/pgp/tests/test_inline.py b/src/mailman_pgp/pgp/tests/test_inline.py
index 0a012f7..e2fccb7 100644
--- a/src/mailman_pgp/pgp/tests/test_inline.py
+++ b/src/mailman_pgp/pgp/tests/test_inline.py
@@ -37,8 +37,12 @@ class TestSigning(InlineWrapperTestCase):
          True),
         (load_message('inline_signed_corrupted.eml'),
          False),
+        (load_message('inline_signed_multipart.eml'),
+         False),
         (load_message('clear.eml'),
          False),
+        (load_message('clear_multipart.eml'),
+         False),
         (load_message('inline_encrypted.eml'),
          False)
     ])
@@ -46,9 +50,22 @@ class TestSigning(InlineWrapperTestCase):
         self.is_signed(message, signed)
 
     @parameterized.expand([
+        (load_message('inline_signed_multipart.eml'),
+         True),
+        (load_message('inline_signed.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):
@@ -58,7 +75,7 @@ class TestSigning(InlineWrapperTestCase):
         (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'))
     ])
@@ -87,6 +104,8 @@ class TestEncryption(InlineWrapperTestCase):
     @parameterized.expand([
         (load_message('inline_encrypted.eml'),
          True),
+        (load_message('inline_encrypted_multipart.eml'),
+         False),
         (load_message('inline_cleartext_signed.eml'),
          False),
         (load_message('inline_cleartext_signed_invalid.eml'),
@@ -96,17 +115,34 @@ class TestEncryption(InlineWrapperTestCase):
         (load_message('inline_signed_corrupted.eml'),
          False),
         (load_message('clear.eml'),
+         False),
+        (load_message('clear_multipart.eml'),
          False)
     ])
     def test_is_encrypted(self, message, encrypted):
         self.is_encrypted(message, encrypted)
 
     @parameterized.expand([
+        (load_message('inline_encrypted.eml'),
+         True),
+        (load_message('inline_encrypted_multipart.eml'),
+         True),
+        (load_message('clear.eml'),
+         False),
+        (load_message('clear_multipart.eml'),
+         False)
+    ])
+    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_key('rsa_1024.pub.asc'),
-          load_key('ecc_p256.pub.asc')))
+          load_key('ecc_p256.pub.asc'))),
+        (load_message('clear_multipart.eml'),
+         load_key('rsa_1024.pub.asc')),
     ])
     def test_encrypt(self, message, keys, **kwargs):
         if isinstance(keys, tuple):
@@ -118,7 +154,7 @@ class TestEncryption(InlineWrapperTestCase):
         (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 +178,8 @@ class TestKeys(InlineWrapperTestCase):
          True),
         (load_message('clear.eml'),
          False),
+        (load_message('clear_multipart.eml'),
+         False),
         (load_message('inline_cleartext_signed.eml'),
          False)
     ])
@@ -162,6 +200,9 @@ class TestCombined(InlineWrapperTestCase):
     @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):
@@ -170,6 +211,9 @@ class TestCombined(InlineWrapperTestCase):
     @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,