1 files changed, 12 insertions, 10 deletions

diff --git a/src/mailman/app/tests/test_workflowmanager.py b/src/mailman/app/tests/test_workflowmanager.py
index 38ed2e468..e21e428f6 100644
--- a/src/mailman/app/tests/test_workflowmanager.py
+++ b/src/mailman/app/tests/test_workflowmanager.py
@@ -20,7 +20,6 @@
 import unittest
 
 from mailman.app.lifecycle import create_list
-from mailman.interfaces.mailinglist import SubscriptionPolicy
 from mailman.interfaces.member import MemberRole
 from mailman.interfaces.pending import IPendings
 from mailman.interfaces.subscriptions import ISubscriptionManager, TokenOwner
@@ -28,6 +27,9 @@ from mailman.interfaces.usermanager import IUserManager
 from mailman.testing.helpers import get_queue_messages
 from mailman.testing.layers import ConfigLayer
 from mailman.utilities.datetime import now
+from mailman.workflows.subscription import (
+    ConfirmModerationSubscriptionPolicy, ConfirmSubscriptionPolicy,
+    ModerationSubscriptionPolicy, OpenSubscriptionPolicy)
 from zope.component import getUtility
 
 
@@ -60,7 +62,7 @@ class TestRegistrar(unittest.TestCase):
         # Registering a subscription request where no confirmation or
         # moderation steps are needed, leaves us with no token or owner, since
         # there's nothing more to do.
-        self._mlist.subscription_policy = SubscriptionPolicy.open
+        self._mlist.subscription_policy = OpenSubscriptionPolicy
         self._anne.verified_on = now()
         token, token_owner, rmember = self._registrar.register(self._anne)
         self.assertIsNone(token)
@@ -82,7 +84,7 @@ class TestRegistrar(unittest.TestCase):
         # (because she does not have a verified address), but not the moderator
         # to approve.  Running the workflow gives us a token.  Confirming the
         # token subscribes the user.
-        self._mlist.subscription_policy = SubscriptionPolicy.open
+        self._mlist.subscription_policy = OpenSubscriptionPolicy
         token, token_owner, rmember = self._registrar.register(self._anne)
         self.assertIsNotNone(token)
         self.assertEqual(token_owner, TokenOwner.subscriber)
@@ -102,7 +104,7 @@ class TestRegistrar(unittest.TestCase):
         # (because of list policy), but not the moderator to approve.  Running
         # the workflow gives us a token.  Confirming the token subscribes the
         # user.
-        self._mlist.subscription_policy = SubscriptionPolicy.confirm
+        self._mlist.subscription_policy = ConfirmSubscriptionPolicy
         self._anne.verified_on = now()
         token, token_owner, rmember = self._registrar.register(self._anne)
         self.assertIsNotNone(token)
@@ -122,7 +124,7 @@ class TestRegistrar(unittest.TestCase):
         # We have a subscription request which requires the moderator to
         # approve.  Running the workflow gives us a token.  Confirming the
         # token subscribes the user.
-        self._mlist.subscription_policy = SubscriptionPolicy.moderate
+        self._mlist.subscription_policy = ModerationSubscriptionPolicy
         self._anne.verified_on = now()
         token, token_owner, rmember = self._registrar.register(self._anne)
         self.assertIsNotNone(token)
@@ -145,7 +147,7 @@ class TestRegistrar(unittest.TestCase):
         # token runs the workflow a little farther, but still gives us a
         # token.  Confirming again subscribes the user.
         self._mlist.subscription_policy = (
-            SubscriptionPolicy.confirm_then_moderate)
+            ConfirmModerationSubscriptionPolicy)
         self._anne.verified_on = now()
         # Runs until subscription confirmation.
         token, token_owner, rmember = self._registrar.register(self._anne)
@@ -180,7 +182,7 @@ class TestRegistrar(unittest.TestCase):
         # sees when they approve the subscription.  This prevents the user
         # from using a replay attack to subvert moderator approval.
         self._mlist.subscription_policy = (
-            SubscriptionPolicy.confirm_then_moderate)
+            ConfirmModerationSubscriptionPolicy)
         self._anne.verified_on = now()
         # Runs until subscription confirmation.
         token, token_owner, rmember = self._registrar.register(self._anne)
@@ -216,7 +218,7 @@ class TestRegistrar(unittest.TestCase):
     def test_discard_waiting_for_confirmation(self):
         # While waiting for a user to confirm their subscription, we discard
         # the workflow.
-        self._mlist.subscription_policy = SubscriptionPolicy.confirm
+        self._mlist.subscription_policy = ConfirmSubscriptionPolicy
         self._anne.verified_on = now()
         # Runs until subscription confirmation.
         token, token_owner, rmember = self._registrar.register(self._anne)
@@ -233,7 +235,7 @@ class TestRegistrar(unittest.TestCase):
     def test_admin_notify_mchanges(self):
         # When a user gets subscribed via the subscription policy workflow,
         # the list administrators get an email notification.
-        self._mlist.subscription_policy = SubscriptionPolicy.open
+        self._mlist.subscription_policy = OpenSubscriptionPolicy
         self._mlist.admin_notify_mchanges = True
         self._mlist.send_welcome_message = False
         token, token_owner, member = self._registrar.register(
@@ -253,7 +255,7 @@ anne@example.com has been successfully subscribed to Ant.
         # Even when a user gets subscribed via the subscription policy
         # workflow, the list administrators won't get an email notification if
         # they don't want one.
-        self._mlist.subscription_policy = SubscriptionPolicy.open
+        self._mlist.subscription_policy = OpenSubscriptionPolicy
         self._mlist.admin_notify_mchanges = False
         self._mlist.send_welcome_message = False
         # Bart is an administrator of the mailing list.