Merge the 'owners' branch. Posting to a list's -owner address now works as

expected.

2 files changed, 0 insertions, 213 deletions

diff --git a/src/mailman/pipeline/tests/__init__.py b/src/mailman/pipeline/tests/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/src/mailman/pipeline/tests/__init__.py
+++ /dev/null
diff --git a/src/mailman/pipeline/tests/test_mimedel.py b/src/mailman/pipeline/tests/test_mimedel.py
deleted file mode 100644
index 566c1a40c..000000000
--- a/src/mailman/pipeline/tests/test_mimedel.py
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright (C) 2012 by the Free Software Foundation, Inc.
-#
-# This file is part of GNU Mailman.
-#
-# GNU Mailman is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option)
-# any later version.
-#
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Test the mime_delete handler."""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
-    'TestDispose',
-    ]
-
-
-import unittest
-
-from zope.component import getUtility
-
-from mailman.app.lifecycle import create_list
-from mailman.config import config
-from mailman.core import errors
-from mailman.interfaces.action import FilterAction
-from mailman.interfaces.member import MemberRole
-from mailman.interfaces.usermanager import IUserManager
-from mailman.pipeline import mime_delete
-from mailman.testing.helpers import (
-    LogFileMark,
-    get_queue_messages,
-    specialized_message_from_string as mfs)
-from mailman.testing.layers import ConfigLayer
-
-
-
-class TestDispose(unittest.TestCase):
-    """Test the mime_delete handler."""
-
-    layer = ConfigLayer
-
-    def setUp(self):
-        self._mlist = create_list('test@example.com')
-        self._msg = mfs("""\
-From: anne@example.com
-To: test@example.com
-Subject: A disposable message
-Message-ID: <ant>
-
-""")
-        # Python 2.7 has assertMultiLineEqual.  Let this work without bounds.
-        self.maxDiff = None
-        self.eq = getattr(self, 'assertMultiLineEqual', self.assertEqual)
-        config.push('dispose', """
-        [mailman]
-        site_owner: noreply@example.com
-        """)
-
-    def tearDown(self):
-        config.pop('dispose')
-
-    def test_dispose_discard(self):
-        self._mlist.filter_action = FilterAction.discard
-        try:
-            mime_delete.dispose(self._mlist, self._msg, {}, 'discarding')
-        except errors.DiscardMessage as error:
-            pass
-        else:
-            raise AssertionError('DiscardMessage exception expected')
-        self.assertEqual(error.message, 'discarding')
-        # There should be no messages in the 'bad' queue.
-        self.assertEqual(len(get_queue_messages('bad')), 0)
-
-    def test_dispose_bounce(self):
-        self._mlist.filter_action = FilterAction.reject
-        try:
-            mime_delete.dispose(self._mlist, self._msg, {}, 'rejecting')
-        except errors.RejectMessage as error:
-            pass
-        else:
-            raise AssertionError('RejectMessage exception expected')
-        self.assertEqual(error.message, 'rejecting')
-        # There should be no messages in the 'bad' queue.
-        self.assertEqual(len(get_queue_messages('bad')), 0)
-
-    def test_dispose_forward(self):
-        # The disposed message gets forwarded to the list moderators.  So
-        # first add some moderators.
-        user_manager = getUtility(IUserManager)
-        anne = user_manager.create_address('anne@example.com')
-        bart = user_manager.create_address('bart@example.com')
-        self._mlist.subscribe(anne, MemberRole.moderator)
-        self._mlist.subscribe(bart, MemberRole.moderator)
-        # Now set the filter action and dispose the message.
-        self._mlist.filter_action = FilterAction.forward
-        try:
-            mime_delete.dispose(self._mlist, self._msg, {}, 'forwarding')
-        except errors.DiscardMessage as error:
-            pass
-        else:
-            raise AssertionError('DiscardMessage exception expected')
-        self.assertEqual(error.message, 'forwarding')
-        # There should now be a multipart message in the virgin queue destined
-        # for the mailing list owners.
-        messages = get_queue_messages('virgin')
-        self.assertEqual(len(messages), 1)
-        message = messages[0].msg
-        self.assertEqual(message.get_content_type(), 'multipart/mixed')
-        # Anne and Bart should be recipients of the message, but it will look
-        # like the message is going to the list owners.
-        self.assertEqual(message['to'], 'test-owner@example.com')
-        self.assertEqual(message.recipients,
-                         set(['anne@example.com', 'bart@example.com']))
-        # The list owner should be the sender.
-        self.assertEqual(message['from'], 'noreply@example.com')
-        self.assertEqual(message['subject'],
-                         'Content filter message notification')
-        # The body of the first part provides the moderators some details.
-        part0 = message.get_payload(0)
-        self.assertEqual(part0.get_content_type(), 'text/plain')
-        self.eq(part0.get_payload(), """\
-The attached message matched the Test mailing list's content
-filtering rules and was prevented from being forwarded on to the list
-membership.  You are receiving the only remaining copy of the discarded
-message.
-
-""")
-        # The second part is the container for the original message.
-        part1 = message.get_payload(1)
-        self.assertEqual(part1.get_content_type(), 'message/rfc822')
-        # And the first part of *that* message will be the original message.
-        original = part1.get_payload(0)
-        self.assertEqual(original['subject'], 'A disposable message')
-        self.assertEqual(original['message-id'], '<ant>')
-
-    def test_dispose_non_preservable(self):
-        # Two actions can happen here, depending on a site-wide setting.  If
-        # the site owner has indicated that filtered messages cannot be
-        # preserved, then this is the same as discarding them.
-        self._mlist.filter_action = FilterAction.preserve
-        config.push('non-preservable', """
-        [mailman]
-        filtered_messages_are_preservable: no
-        """)
-        try:
-            mime_delete.dispose(self._mlist, self._msg, {}, 'not preserved')
-        except errors.DiscardMessage as error:
-            pass
-        else:
-            raise AssertionError('DiscardMessage exception expected')
-        finally:
-            config.pop('non-preservable')
-        self.assertEqual(error.message, 'not preserved')
-        # There should be no messages in the 'bad' queue.
-        self.assertEqual(len(get_queue_messages('bad')), 0)
-
-    def test_dispose_preservable(self):
-        # Two actions can happen here, depending on a site-wide setting.  If
-        # the site owner has indicated that filtered messages can be
-        # preserved, then this is similar to discarding the message except
-        # that a copy is preserved in the 'bad' queue.
-        self._mlist.filter_action = FilterAction.preserve
-        config.push('preservable', """
-        [mailman]
-        filtered_messages_are_preservable: yes
-        """)
-        try:
-            mime_delete.dispose(self._mlist, self._msg, {}, 'preserved')
-        except errors.DiscardMessage as error:
-            pass
-        else:
-            raise AssertionError('DiscardMessage exception expected')
-        finally:
-            config.pop('preservable')
-        self.assertEqual(error.message, 'preserved')
-        # There should be no messages in the 'bad' queue.
-        messages = get_queue_messages('bad')
-        self.assertEqual(len(messages), 1)
-        message = messages[0].msg
-        self.assertEqual(message['subject'], 'A disposable message')
-        self.assertEqual(message['message-id'], '<ant>')
-
-    def test_bad_action(self):
-        # This should never happen, but what if it does?
-        # FilterAction.accept, FilterAction.hold, and FilterAction.defer are
-        # not valid.  They are treated as discard actions, but the problem is
-        # also logged.
-        for action in (FilterAction.accept,
-                       FilterAction.hold,
-                       FilterAction.defer):
-            self._mlist.filter_action = action
-            mark = LogFileMark('mailman.error')
-            try:
-                mime_delete.dispose(self._mlist, self._msg, {}, 'bad action')
-            except errors.DiscardMessage as error:
-                pass
-            else:
-                raise AssertionError('DiscardMessage exception expected')
-            self.assertEqual(error.message, 'bad action')
-            line = mark.readline()[:-1]
-            self.assertTrue(line.endswith(
-                '{0} invalid FilterAction: test@example.com.  '
-                'Treating as discard'.format(action.name)))