Replace add_member() with subscribe() helper.

1 files changed, 6 insertions, 16 deletions

diff --git a/src/mailman/app/tests/test_bounces.py b/src/mailman/app/tests/test_bounces.py
index 626d4841f..ef77d88a0 100644
--- a/src/mailman/app/tests/test_bounces.py
+++ b/src/mailman/app/tests/test_bounces.py
@@ -36,16 +36,15 @@ import unittest
 from mailman.app.bounces import (
     ProbeVERP, StandardVERP, bounce_message, maybe_forward, send_probe)
 from mailman.app.lifecycle import create_list
-from mailman.app.membership import add_member
 from mailman.config import config
 from mailman.interfaces.bounce import UnrecognizedBounceDisposition
 from mailman.interfaces.languages import ILanguageManager
-from mailman.interfaces.member import DeliveryMode, MemberRole
+from mailman.interfaces.member import MemberRole
 from mailman.interfaces.pending import IPendings
-from mailman.interfaces.subscriptions import RequestRecord
 from mailman.interfaces.usermanager import IUserManager
 from mailman.testing.helpers import (
-    LogFileMark, get_queue_messages, specialized_message_from_string as mfs)
+    LogFileMark, get_queue_messages, specialized_message_from_string as mfs,
+    subscribe)
 from mailman.testing.layers import ConfigLayer
 from zope.component import getUtility
 
@@ -194,10 +193,7 @@ class TestSendProbe(unittest.TestCase):
     def setUp(self):
         self._mlist = create_list('test@example.com')
         self._mlist.send_welcome_message = False
-        self._member = add_member(
-            self._mlist,
-            RequestRecord('anne@example.com', 'Anne Person',
-                          DeliveryMode.regular, 'en'))
+        self._member = subscribe(self._mlist, 'Anne', email='anne@example.com')
         self._msg = mfs("""\
 From: bouncer@example.com
 To: anne@example.com
@@ -287,10 +283,7 @@ class TestSendProbeNonEnglish(unittest.TestCase):
 
     def setUp(self):
         self._mlist = create_list('test@example.com')
-        self._member = add_member(
-            self._mlist,
-            RequestRecord('anne@example.com', 'Anne Person',
-                          DeliveryMode.regular, 'en'))
+        self._member = subscribe(self._mlist, 'Anne', email='anne@example.com')
         self._msg = mfs("""\
 From: bouncer@example.com
 To: anne@example.com
@@ -354,10 +347,7 @@ class TestProbe(unittest.TestCase):
     def setUp(self):
         self._mlist = create_list('test@example.com')
         self._mlist.send_welcome_message = False
-        self._member = add_member(
-            self._mlist,
-            RequestRecord('anne@example.com', 'Anne Person',
-                          DeliveryMode.regular, 'en'))
+        self._member = subscribe(self._mlist, 'Anne', email='anne@example.com')
         self._msg = mfs("""\
 From: bouncer@example.com
 To: anne@example.com