merge trunk and fix merge conflicts

2 files changed, 8 insertions, 5 deletions

diff --git a/src/mailman/runners/tests/test_confirm.py b/src/mailman/runners/tests/test_confirm.py
index 71ec5988d..b24d14a52 100644
--- a/src/mailman/runners/tests/test_confirm.py
+++ b/src/mailman/runners/tests/test_confirm.py
@@ -53,7 +53,8 @@ class TestConfirm(unittest.TestCase):
             self._mlist = create_list('test@example.com')
             self._mlist.send_welcome_message = False
             anne = getUtility(IUserManager).create_address('anne@example.org')
-            self._token = IRegistrar(self._mlist).register(anne)
+            registrar = IRegistrar(self._mlist)
+            self._token, token_owner, member = registrar.register(anne)
 
     def test_confirm_with_re_prefix(self):
         subject = 'Re: confirm {0}'.format(self._token)
diff --git a/src/mailman/runners/tests/test_join.py b/src/mailman/runners/tests/test_join.py
index c3b52cf0c..1067517e2 100644
--- a/src/mailman/runners/tests/test_join.py
+++ b/src/mailman/runners/tests/test_join.py
@@ -30,7 +30,7 @@ from mailman.app.lifecycle import create_list
 from mailman.config import config
 from mailman.interfaces.member import DeliveryMode
 from mailman.interfaces.registrar import IRegistrar
-from mailman.interfaces.subscriptions import ISubscriptionService
+from mailman.interfaces.subscriptions import ISubscriptionService, TokenOwner
 from mailman.interfaces.usermanager import IUserManager
 from mailman.runners.command import CommandRunner
 from mailman.testing.helpers import (
@@ -160,14 +160,16 @@ class TestJoinWithDigests(unittest.TestCase):
         subject_words = str(messages[1].msg['subject']).split()
         self.assertEqual(subject_words[0], 'confirm')
         token = subject_words[1]
-        status = IRegistrar(self._mlist).confirm(token)
-        self.assertIsNone(status, 'Confirmation failed')
+        token, token_owner, rmember = IRegistrar(self._mlist).confirm(token)
+        self.assertIsNone(token)
+        self.assertEqual(token_owner, TokenOwner.no_one)
         # Now, make sure that Anne is a member of the list and is receiving
         # digest deliveries.
         members = getUtility(ISubscriptionService).find_members(
             'anne@example.org')
         self.assertEqual(len(members), 1)
-        return members[0]
+        self.assertEqual(rmember, members[0])
+        return rmember
 
     def test_join_with_implicit_no_digests(self):
         # Test the digest=mime argument to the join command.