Use custom moderator approval mixin/messages for subscription.

2 files changed, 13 insertions, 4 deletions

diff --git a/src/mailman_pgp/workflows/tests/test_base.py b/src/mailman_pgp/workflows/tests/test_base.py
index 5273939..440068c 100644
--- a/src/mailman_pgp/workflows/tests/test_base.py
+++ b/src/mailman_pgp/workflows/tests/test_base.py
@@ -37,8 +37,8 @@ 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.base import (PGPMixin)
-from mailman_pgp.workflows.pubkey import (ConfirmPubkeyMixin, KEY_REQUEST,
-                                          SetPubkeyMixin)
+from mailman_pgp.workflows.key_confirm import ConfirmPubkeyMixin
+from mailman_pgp.workflows.key_set import KEY_REQUEST, SetPubkeyMixin
 
 
 class PubkeyMixinTestSetup():
diff --git a/src/mailman_pgp/workflows/tests/test_mod_approval.py b/src/mailman_pgp/workflows/tests/test_mod_approval.py
index 49e4204..7d57a9b 100644
--- a/src/mailman_pgp/workflows/tests/test_mod_approval.py
+++ b/src/mailman_pgp/workflows/tests/test_mod_approval.py
@@ -33,14 +33,23 @@ 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 KeyChangeBase
-from mailman_pgp.workflows.mod_approval import ModeratorApprovalMixin
+from mailman_pgp.workflows.mod_approval import (
+    ModeratorKeyChangeApprovalMixin)
 
 
 @implementer(IWorkflow)
-class PGPTestWorkflow(KeyChangeBase, ModeratorApprovalMixin):
+class PGPTestWorkflow(KeyChangeBase, ModeratorKeyChangeApprovalMixin):
     name = 'test-workflow'
     description = ''
     initial_state = 'mod_approval'
+    save_attributes = (
+        'approved',
+    )
+
+    def __init__(self, mlist, pgp_address=None, pubkey=None,
+                 pre_approved=False):
+        KeyChangeBase.__init__(self, mlist, pgp_address, pubkey)
+        ModeratorKeyChangeApprovalMixin.__init__(self, pre_approved)
 
 
 class TestModeratorApprovalMixin(TestCase):