3 files changed, 65 insertions, 5 deletions

diff --git a/src/mailman/archiving/tests/test_prototype.py b/src/mailman/archiving/tests/test_prototype.py
index 7f48c5cfd..29f6ba1cb 100644
--- a/src/mailman/archiving/tests/test_prototype.py
+++ b/src/mailman/archiving/tests/test_prototype.py
@@ -150,13 +150,13 @@ but the water deserves to be swum.
             archive_thread.run()
             # Test that the archiver output the correct error.
             line = mark.readline()
-            self.assertEqual(
-                # Strip out the timestamp.
-                line[28:-1],
+            # XXX 2012-03-15 BAW: we really should remove timestamp prefixes
+            # from the loggers when under test.
+            self.assertTrue(line.endswith(
                 'Unable to acquire prototype archiver lock for {0}, '
-                'discarding: {1}'.format(
+                'discarding: {1}\n'.format(
                     self._mlist.fqdn_listname,
-                    self._msg.get('message-id')))
+                    self._msg.get('message-id'))))
         # Check that the message didn't get archived.
         created_files = self._find(config.ARCHIVE_DIR)
         self.assertEqual(self._expected_dir_structure, created_files)
diff --git a/src/mailman/email/tests/__init__.py b/src/mailman/email/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/src/mailman/email/tests/__init__.py
diff --git a/src/mailman/email/tests/test_message.py b/src/mailman/email/tests/test_message.py
new file mode 100644
index 000000000..ee4f6135d
--- /dev/null
+++ b/src/mailman/email/tests/test_message.py
@@ -0,0 +1,60 @@
+# 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 message API."""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+__metaclass__ = type
+__all__ = [
+    'TestMessage',
+    ]
+
+
+import unittest
+
+from mailman.app.lifecycle import create_list
+from mailman.email.message import UserNotification
+from mailman.testing.helpers import get_queue_messages
+from mailman.testing.layers import ConfigLayer
+
+
+
+class TestMessage(unittest.TestCase):
+    """Test the message API."""
+
+    layer = ConfigLayer
+
+    def setUp(self):
+        self._mlist = create_list('test@example.com')
+        self._msg = UserNotification(
+            'aperson@example.com',
+            'test@example.com',
+            'Something you need to know',
+            'I needed to tell you this.')
+
+    def test_one_precedence_header(self):
+        # Ensure that when the original message already has a Precedence:
+        # header, UserNotification.send(..., add_precedence=True, ...) does
+        # not add a second header.
+        self.assertEqual(self._msg['precedence'], None)
+        self._msg['Precedence'] = 'omg wtf bbq'
+        self._msg.send(self._mlist)
+        messages = get_queue_messages('virgin')
+        self.assertEqual(len(messages), 1)
+        self.assertEqual(messages[0].msg.get_all('precedence'), 
+                         ['omg wtf bbq'])