1 files changed, 20 insertions, 7 deletions

diff --git a/src/mailman_pgp/testing/pgp.py b/src/mailman_pgp/testing/pgp.py
index 7f207e3..90deb7a 100644
--- a/src/mailman_pgp/testing/pgp.py
+++ b/src/mailman_pgp/testing/pgp.py
@@ -142,20 +142,21 @@ class WrapperTestCase(TestCase):
         loaded = list(wrapped.keys())
         self.assertEqual(len(loaded), len(keys))
 
-        loaded_fingerprints = list(map(lambda key: key.fingerprint, loaded))
-        fingerprints = list(map(lambda key: key.fingerprint, keys))
+        get_fingerprint = lambda key: key.fingerprint
+        loaded_fingerprints = list(map(get_fingerprint, loaded))
+        fingerprints = list(map(get_fingerprint, keys))
         self.assertListEqual(loaded_fingerprints, fingerprints)
 
     def attach_keys(self, message, keys):
         wrapped = self.wrap(message)
-        for key in keys:
-            attached = wrapped.attach_key(key)
-            wrapped = self.wrap(attached)
+        attached = wrapped.attach_keys(*keys)
+        wrapped = self.wrap(attached)
         loaded = list(wrapped.keys())
 
         self.assertTrue(wrapped.has_keys())
-        loaded_fingerprints = list(map(lambda key: key.fingerprint, loaded))
-        fingerprints = list(map(lambda key: key.fingerprint, keys))
+        get_fingerprint = lambda key: key.fingerprint
+        loaded_fingerprints = list(map(get_fingerprint, loaded))
+        fingerprints = list(map(get_fingerprint, keys))
         self.assertListEqual(loaded_fingerprints, fingerprints)
 
     def has_revocs(self, message, has_revocs):
@@ -176,6 +177,18 @@ class WrapperTestCase(TestCase):
         issuers = list(map(get_issuer, revocs))
         self.assertListEqual(loaded_issuers, issuers)
 
+    def attach_revocs(self, message, revocs):
+        wrapped = self.wrap(message)
+        attached = wrapped.attach_revocs(*revocs)
+        wrapped = self.wrap(attached)
+        loaded = list(wrapped.revocs())
+
+        self.assertTrue(wrapped.has_revocs())
+        get_issuer = lambda revoc: revoc.signer
+        loaded_issuers = list(map(get_issuer, loaded))
+        issuers = list(map(get_issuer, revocs))
+        self.assertListEqual(loaded_issuers, issuers)
+
     def sign_encrypt_decrypt_verify(self, message, sign_key, encrypt_key):
         wrapped = self.wrap(message)
         encrypted = wrapped.sign_encrypt(sign_key, encrypt_key.pubkey)