diff options
Diffstat (limited to 'src/mailman/app/tests/test_notifications.py')
| -rw-r--r-- | src/mailman/app/tests/test_notifications.py | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/mailman/app/tests/test_notifications.py b/src/mailman/app/tests/test_notifications.py index 19c11d0a4..e01969201 100644 --- a/src/mailman/app/tests/test_notifications.py +++ b/src/mailman/app/tests/test_notifications.py @@ -32,7 +32,7 @@ from mailman.config import config from mailman.interfaces.languages import ILanguageManager from mailman.interfaces.member import MemberRole from mailman.interfaces.usermanager import IUserManager -from mailman.testing.helpers import get_queue_messages, subscribe, subscribe_ex +from mailman.testing.helpers import get_queue_messages, subscribe from mailman.testing.layers import ConfigLayer from zope.component import getUtility @@ -104,7 +104,7 @@ Welcome to the Test List mailing list. # Add the xx language and subscribe Anne using it. manager = getUtility(ILanguageManager) manager.add('xx', 'us-ascii', 'Xlandia') - # We can't use the subscribe_ex() helper because that would send the + # We can't use the subscribe() helper because that would send the # welcome message before we set the member's preferred language. address = getUtility(IUserManager).create_address( 'anne@example.com', 'Anne Person') @@ -122,29 +122,23 @@ Welcome to the Test List mailing list. def test_no_welcome_message_to_owners(self): # Welcome messages go only to mailing list members, not to owners. - member = subscribe_ex( - self._mlist, 'Anne', MemberRole.owner, email='anne@example.com') - member.preferences.preferred_language = 'xx' + subscribe(self._mlist, 'Anne', MemberRole.owner, 'anne@example.com') # There is no welcome message in the virgin queue. messages = get_queue_messages('virgin') self.assertEqual(len(messages), 0) def test_no_welcome_message_to_nonmembers(self): # Welcome messages go only to mailing list members, not to nonmembers. - member = subscribe_ex( - self._mlist, 'Anne', MemberRole.nonmember, - email='anne@example.com') - member.preferences.preferred_language = 'xx' + subscribe(self._mlist, 'Anne', MemberRole.nonmember, + 'anne@example.com') # There is no welcome message in the virgin queue. messages = get_queue_messages('virgin') self.assertEqual(len(messages), 0) def test_no_welcome_message_to_moderators(self): # Welcome messages go only to mailing list members, not to moderators. - member = subscribe_ex( - self._mlist, 'Anne', MemberRole.moderator, - email='anne@example.com') - member.preferences.preferred_language = 'xx' + subscribe(self._mlist, 'Anne', MemberRole.moderator, + 'anne@example.com') # There is no welcome message in the virgin queue. messages = get_queue_messages('virgin') self.assertEqual(len(messages), 0) |