Intermediate Commit

2 files changed, 8 insertions, 7 deletions

diff --git a/src/mailman/rest/tests/test_membership.py b/src/mailman/rest/tests/test_membership.py
index 1ea70e90b..9dec17fc8 100644
--- a/src/mailman/rest/tests/test_membership.py
+++ b/src/mailman/rest/tests/test_membership.py
@@ -25,7 +25,7 @@ from mailman.database.transaction import transaction
 from mailman.interfaces.bans import IBanManager
 from mailman.interfaces.mailinglist import SubscriptionPolicy
 from mailman.interfaces.member import DeliveryMode, MemberRole
-from mailman.interfaces.registrar import IRegistrar
+from mailman.interfaces.workflowmanager import IWorkflowManager
 from mailman.interfaces.subscriptions import TokenOwner
 from mailman.interfaces.usermanager import IUserManager
 from mailman.runners.incoming import IncomingRunner
@@ -35,7 +35,7 @@ from mailman.testing.helpers import (
 from mailman.testing.layers import ConfigLayer, RESTLayer
 from mailman.utilities.datetime import now
 from urllib.error import HTTPError
-from zope.component import getUtility
+from zope.component import getUtility, getAdapter
 
 
 class TestMembership(unittest.TestCase):
@@ -215,7 +215,7 @@ class TestMembership(unittest.TestCase):
     def test_duplicate_pending_subscription(self):
         # Issue #199 - a member's subscription is already pending and they try
         # to subscribe again.
-        registrar = IRegistrar(self._mlist)
+        registrar = getAdapter(self._mlist, IWorkflowManager, name='subscribe')
         with transaction():
             self._mlist.subscription_policy = SubscriptionPolicy.moderate
             anne = self._usermanager.create_address('anne@example.com')
@@ -238,7 +238,7 @@ class TestMembership(unittest.TestCase):
         # Issue #199 - a member's subscription is already pending and they try
         # to subscribe again.  Unlike above, this pend is waiting for the user
         # to confirm their subscription.
-        registrar = IRegistrar(self._mlist)
+        registrar = getAdapter(self._mlist, IWorkflowManager, name='subscribe')
         with transaction():
             self._mlist.subscription_policy = (
                 SubscriptionPolicy.confirm_then_moderate)
diff --git a/src/mailman/rest/tests/test_moderation.py b/src/mailman/rest/tests/test_moderation.py
index 9f9da6b18..1b9febdce 100644
--- a/src/mailman/rest/tests/test_moderation.py
+++ b/src/mailman/rest/tests/test_moderation.py
@@ -24,7 +24,7 @@ from mailman.app.moderator import hold_message
 from mailman.database.transaction import transaction
 from mailman.interfaces.bans import IBanManager
 from mailman.interfaces.mailinglist import SubscriptionPolicy
-from mailman.interfaces.registrar import IRegistrar
+from mailman.interfaces.workflowmanager import IWorkflowManager
 from mailman.interfaces.requests import IListRequests, RequestType
 from mailman.interfaces.usermanager import IUserManager
 from mailman.testing.helpers import (
@@ -32,7 +32,7 @@ from mailman.testing.helpers import (
     specialized_message_from_string as mfs)
 from mailman.testing.layers import RESTLayer
 from urllib.error import HTTPError
-from zope.component import getUtility
+from zope.component import getUtility, getAdapter
 
 
 class TestPostModeration(unittest.TestCase):
@@ -150,7 +150,8 @@ class TestSubscriptionModeration(unittest.TestCase):
     def setUp(self):
         with transaction():
             self._mlist = create_list('ant@example.com')
-            self._registrar = IRegistrar(self._mlist)
+            self._registrar = getAdapter(
+                self._mlist, IWorkflowManager, name='subscribe')
             manager = getUtility(IUserManager)
             self._anne = manager.create_address(
                 'anne@example.com', 'Anne Person')