plugin

2 files changed, 14 insertions, 12 deletions

diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py
index b1b4764ff..6db0c4a4a 100644
--- a/src/mailman/utilities/tests/test_import.py
+++ b/src/mailman/utilities/tests/test_import.py
@@ -33,8 +33,7 @@ from mailman.interfaces.bans import IBanManager
 from mailman.interfaces.bounce import UnrecognizedBounceDisposition
 from mailman.interfaces.domain import IDomainManager
 from mailman.interfaces.languages import ILanguageManager
-from mailman.interfaces.mailinglist import (
-    IAcceptableAliasSet, SubscriptionPolicy)
+from mailman.interfaces.mailinglist import IAcceptableAliasSet
 from mailman.interfaces.member import DeliveryMode, DeliveryStatus
 from mailman.interfaces.nntp import NewsgroupModeration
 from mailman.interfaces.template import ITemplateLoader, ITemplateManager
@@ -44,6 +43,9 @@ from mailman.testing.layers import ConfigLayer
 from mailman.utilities.filesystem import makedirs
 from mailman.utilities.importer import (
     Import21Error, check_language_code, import_config_pck)
+from mailman.workflows.subscription import (
+    ConfirmModerationSubscriptionPolicy, ConfirmSubscriptionPolicy,
+    ModerationSubscriptionPolicy, OpenSubscriptionPolicy)
 from pickle import load
 from pkg_resources import resource_filename
 from unittest import mock
@@ -295,32 +297,32 @@ class TestBasicImport(unittest.TestCase):
         self.assertEqual(self._mlist.encode_ascii_prefixes, True)
 
     def test_subscription_policy_open(self):
-        self._mlist.subscription_policy = SubscriptionPolicy.confirm
+        self._mlist.subscription_policy = ConfirmSubscriptionPolicy
         self._pckdict['subscribe_policy'] = 0
         self._import()
         self.assertEqual(self._mlist.subscription_policy,
-                         SubscriptionPolicy.open)
+                         OpenSubscriptionPolicy)
 
     def test_subscription_policy_confirm(self):
-        self._mlist.subscription_policy = SubscriptionPolicy.open
+        self._mlist.subscription_policy = OpenSubscriptionPolicy
         self._pckdict['subscribe_policy'] = 1
         self._import()
         self.assertEqual(self._mlist.subscription_policy,
-                         SubscriptionPolicy.confirm)
+                         ConfirmSubscriptionPolicy)
 
     def test_subscription_policy_moderate(self):
-        self._mlist.subscription_policy = SubscriptionPolicy.open
+        self._mlist.subscription_policy = OpenSubscriptionPolicy
         self._pckdict['subscribe_policy'] = 2
         self._import()
         self.assertEqual(self._mlist.subscription_policy,
-                         SubscriptionPolicy.moderate)
+                         ModerationSubscriptionPolicy)
 
     def test_subscription_policy_confirm_then_moderate(self):
-        self._mlist.subscription_policy = SubscriptionPolicy.open
+        self._mlist.subscription_policy = OpenSubscriptionPolicy
         self._pckdict['subscribe_policy'] = 3
         self._import()
         self.assertEqual(self._mlist.subscription_policy,
-                         SubscriptionPolicy.confirm_then_moderate)
+                         ConfirmModerationSubscriptionPolicy)
 
     def test_header_matches(self):
         # This test containes real cases of header_filter_rules.
diff --git a/src/mailman/utilities/tests/test_modules.py b/src/mailman/utilities/tests/test_modules.py
index 82d44cff4..08ec3848a 100644
--- a/src/mailman/utilities/tests/test_modules.py
+++ b/src/mailman/utilities/tests/test_modules.py
@@ -99,8 +99,8 @@ class BadStyle:
                      in find_components('mypackage', IStyle)]
             self.assertEqual(names, ['good-style'])
 
-    def test_find_components_no_instantiate(self):
-        # find_components() now instantiates the class unless it's been
+    def test_find_components_abstract_component(self):
+        # find_components() finds the class unless it's been
         # decorated with the @abstract_component decorator.
         with ExitStack() as resources:
             # Creating a temporary directory and adding it to sys.path.