1 files changed, 27 insertions, 4 deletions

diff --git a/src/mailman_pgp/workflows/tests/test_key_change.py b/src/mailman_pgp/workflows/tests/test_key_change.py
index e469d51..5d4926a 100644
--- a/src/mailman_pgp/workflows/tests/test_key_change.py
+++ b/src/mailman_pgp/workflows/tests/test_key_change.py
@@ -25,13 +25,15 @@ from mailman.interfaces.usermanager import IUserManager
 from mailman.testing.helpers import get_queue_messages
 from zope.component import getUtility
 
+from mailman_pgp.config import mm_config
 from mailman_pgp.database import mm_transaction, transaction
 from mailman_pgp.model.address import PGPAddress
 from mailman_pgp.model.list import PGPMailingList
 from mailman_pgp.pgp.wrapper import PGPWrapper
 from mailman_pgp.testing.layers import PGPConfigLayer
 from mailman_pgp.testing.pgp import load_key
-from mailman_pgp.workflows.key_change import KeyChangeWorkflow
+from mailman_pgp.workflows.key_change import (KeyChangeModWorkflow,
+                                              KeyChangeWorkflow)
 
 
 class TestKeyChangeWorkflow(unittest.TestCase):
@@ -41,13 +43,18 @@ class TestKeyChangeWorkflow(unittest.TestCase):
         with mm_transaction():
             self.mlist = create_list('test@example.com',
                                      style_name='pgp-default')
-        self.pgp_list = PGPMailingList.for_list(self.mlist)
-        self.pgp_list.key = load_key('ecc_p256.priv.asc')
+        with transaction():
+            self.pgp_list = PGPMailingList.for_list(self.mlist)
+            self.pgp_list.key = load_key('ecc_p256.priv.asc')
 
         self.sender_key = load_key('rsa_1024.priv.asc')
         self.sender_new_key = load_key('ecc_p256.priv.asc')
         self.sender = getUtility(IUserManager).create_address(
-                'rsa-1024b@example.org')
+                'anne@example.org')
+
+    def test_has_workflows(self):
+        self.assertTrue(KeyChangeWorkflow.name, mm_config.workflows)
+        self.assertTrue(KeyChangeModWorkflow.name, mm_config.workflows)
 
     def test_pgp_address_none(self):
         workflow = KeyChangeWorkflow(self.mlist)
@@ -101,3 +108,19 @@ class TestKeyChangeWorkflow(unittest.TestCase):
         self.assertEqual(pgp_address.key_fingerprint,
                          self.sender_new_key.fingerprint)
         self.assertTrue(pgp_address.key_confirmed)
+
+    def test_confirm_mod(self):
+        with transaction() as t:
+            pgp_address = PGPAddress(self.sender)
+            pgp_address.key = self.sender_key.pubkey
+            pgp_address.key_confirmed = True
+            t.add(pgp_address)
+
+        workflow = KeyChangeModWorkflow(self.mlist, pgp_address,
+                                        self.sender_new_key.pubkey)
+        list(workflow)
+
+        token, token_owner, member = ISubscriptionManager(self.mlist).confirm(
+                workflow.token)
+        self.assertIsNotNone(token)
+        self.assertEqual(token_owner, TokenOwner.moderator)