* Fixed Unicode errors in the digest runner and when sending messages to the

   site owner as a fallback.  Given by Aurélien Bompard.  (LP: #1130957).

Also:

 * Convert some uses of the unicode() built-in to bytes.decode() in
   preparation for Python 3 and to eliminate some pyflakes errors.

 * Added LogFileMark.read() as a convenience method.

1 files changed, 112 insertions, 0 deletions

diff --git a/src/mailman/runners/tests/test_digest.py b/src/mailman/runners/tests/test_digest.py
new file mode 100644
index 000000000..80cf253bc
--- /dev/null
+++ b/src/mailman/runners/tests/test_digest.py
@@ -0,0 +1,112 @@
+# Copyright (C) 2014 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 digest runner."""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+__metaclass__ = type
+__all__ = [
+    'TestDigest',
+    ]
+
+
+import os
+import unittest
+
+from email.mime.text import MIMEText
+from mailman.app.lifecycle import create_list
+from mailman.config import config
+from mailman.email.message import Message
+from mailman.runners.digest import DigestRunner
+from mailman.testing.helpers import (
+    LogFileMark, digest_mbox, get_queue_messages, make_testable_runner,
+    specialized_message_from_string as mfs)
+from mailman.testing.layers import ConfigLayer
+
+
+
+class TestDigest(unittest.TestCase):
+    """Test the digest runner."""
+
+    layer = ConfigLayer
+
+    def setUp(self):
+        self._mlist = create_list('test@example.com')
+        self._mlist.digest_size_threshold = 1
+        self._digestq = config.switchboards['digest']
+        self._shuntq = config.switchboards['shunt']
+        self._virginq = config.switchboards['virgin']
+        self._runner = make_testable_runner(DigestRunner, 'digest')
+        self._process = config.handlers['to-digest'].process
+
+    def test_simple_message(self):
+        msg = mfs("""\
+From: anne@example.org
+To: test@example.com
+
+message triggering a digest
+""")
+        mbox_path = os.path.join(self._mlist.data_path, 'digest.mmdf')
+        self._process(self._mlist, msg, {})
+        self._digestq.enqueue(
+            msg,
+            listname=self._mlist.fqdn_listname,
+            digest_path=mbox_path,
+            volume=1, digest_number=1)
+        self._runner.run()
+        # There are two messages in the virgin queue: the digest as plain-text
+        # and as multipart.
+        messages = get_queue_messages('virgin')
+        self.assertEqual(len(messages), 2)
+        self.assertEqual(
+            sorted(item.msg.get_content_type() for item in messages),
+            ['multipart/mixed', 'text/plain'])
+        for item in messages:
+            self.assertEqual(item.msg['subject'],
+                             'Test Digest, Vol 1, Issue 1')
+
+    def test_non_ascii_message(self):
+        msg = Message()
+        msg['From'] = 'anne@example.org'
+        msg['To'] = 'test@example.com'
+        msg['Content-Type'] = 'multipart/mixed'
+        msg.attach(MIMEText('message with non-ascii chars: \xc3\xa9',
+                            'plain', 'utf-8'))
+        mbox = digest_mbox(self._mlist)
+        mbox_path = os.path.join(self._mlist.data_path, 'digest.mmdf')
+        mbox.add(msg.as_string())
+        self._digestq.enqueue(
+            msg,
+            listname=self._mlist.fqdn_listname,
+            digest_path=mbox_path,
+            volume=1, digest_number=1)
+        # Use any error logs as the error message if the test fails.
+        error_log = LogFileMark('mailman.error')
+        self._runner.run()
+        # The runner will send the file to the shunt queue on exception.
+        self.assertEqual(len(self._shuntq.files), 0, error_log.read())
+        # There are two messages in the virgin queue: the digest as plain-text
+        # and as multipart.
+        messages = get_queue_messages('virgin')
+        self.assertEqual(len(messages), 2)
+        self.assertEqual(
+            sorted(item.msg.get_content_type() for item in messages),
+            ['multipart/mixed', 'text/plain'])
+        for item in messages:
+            self.assertEqual(item.msg['subject'],
+                             'Test Digest, Vol 1, Issue 1')