diff options
| -rw-r--r-- | src/mailman/utilities/importer.py | 16 | ||||
| -rw-r--r-- | src/mailman/utilities/tests/test_import.py | 11 |
2 files changed, 22 insertions, 5 deletions
diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py index 1819ab843..f4373be79 100644 --- a/src/mailman/utilities/importer.py +++ b/src/mailman/utilities/importer.py @@ -388,11 +388,17 @@ def import_config_pck(mlist, config_dict): regulars_set = set(config_dict.get('members', {})) digesters_set = set(config_dict.get('digest_members', {})) members = regulars_set.union(digesters_set) - import_roster(mlist, config_dict, members, MemberRole.member) - import_roster(mlist, config_dict, config_dict.get('owner', []), - MemberRole.owner) - import_roster(mlist, config_dict, config_dict.get('moderator', []), - MemberRole.moderator) + # don't send welcome messages... + send_welcome_message = mlist.send_welcome_message + mlist.send_welcome_message = False + try: + import_roster(mlist, config_dict, members, MemberRole.member) + import_roster(mlist, config_dict, config_dict.get('owner', []), + MemberRole.owner) + import_roster(mlist, config_dict, config_dict.get('moderator', []), + MemberRole.moderator) + finally: + mlist.send_welcome_message = send_welcome_message diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py index 818e7020f..83ad06108 100644 --- a/src/mailman/utilities/tests/test_import.py +++ b/src/mailman/utilities/tests/test_import.py @@ -772,6 +772,17 @@ class TestRosterImport(unittest.TestCase): self.assertEqual(['anne@example.com'], [a.email for a in self._mlist.members.addresses]) + def test_no_email_sent(self): + self._pckdict + import_config_pck(self._mlist, self._pckdict) + self.assertIn("anne@example.com", + [a.email for a in self._mlist.members.addresses]) + # no email in any queue + for qname, sb in config.switchboards.items(): + self.assertEqual(len(sb.files), 0, + "Queue '{}' has {} emails".format(qname, len(sb.files))) + self.assertTrue(self._mlist.send_welcome_message) + class TestPreferencesImport(unittest.TestCase): |