GNU Mailman

Merge lp:~syst3mw0rm/mailman/bug-890675 into lp:mailman

  1. bug-890675
  2. Merge into 3.0
Proposed by Aamir Khan
Status: Merged
Merge reported by: Barry Warsaw
Merged at revision: not available
Proposed branch: lp:~syst3mw0rm/mailman/bug-890675
Merge into: lp:mailman
Diff against target: 23 lines (+3/-2)
2 files modified
src/mailman/app/tests/test_moderation.py (+2/-2)
src/mailman/docs/NEWS.rst (+1/-0)
To merge this branch: bzr merge lp:~syst3mw0rm/mailman/bug-890675
Reviewer Review Type Date Requested Status
Antti Kaihola (community) Approve
Mailman Coders Pending
Review via email: mp+93669@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Antti Kaihola (akaihola) wrote :

I just verified that this patch fixes the test suite on revno 7103 on timezone UTC+02 (Europe/Helsinki).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/mailman/app/tests/test_moderation.py'
2--- src/mailman/app/tests/test_moderation.py 2012-01-30 15:37:16 +0000
3+++ src/mailman/app/tests/test_moderation.py 2012-02-18 00:34:20 +0000
4@@ -80,8 +80,8 @@
5 self.assertTrue('x-peer' in message)
6 # The X-Mailman-Approved-At header has local timezone information in
7 # it, so test that separately.
8- self.assertEqual(message['x-mailman-approved-at'][:-4],
9- 'Mon, 01 Aug 2005 07:49:23 -')
10+ self.assertEqual(message['x-mailman-approved-at'][:-5],
11+ 'Mon, 01 Aug 2005 07:49:23 ')
12 del message['x-mailman-approved-at']
13 # The Message-ID matches the original.
14 self.assertEqual(message['message-id'], '<alpha>')
15
16=== modified file 'src/mailman/docs/NEWS.rst'
17--- src/mailman/docs/NEWS.rst 2012-02-12 15:01:07 +0000
18+++ src/mailman/docs/NEWS.rst 2012-02-18 00:34:20 +0000
19@@ -617,3 +617,4 @@
20 * The List-Help, List-Subscribe, and List-Unsubscribe headers were
21 incorrectly suppressed in messages that Mailman sends directly to users.
22 * The 'adminapproved' metadata key is renamed 'moderator_approved'.
23+ * Test case failure due to X-Mailman-Approved-At, patch by blacktav (LP: #890675)