Merge lp:~barry/launchpad/mm2112 into lp:launchpad

Proposed by Barry Warsaw
Status: Merged
Merged at revision: not available
Proposed branch: lp:~barry/launchpad/mm2112
Merge into: lp:launchpad
Diff against target: 12 lines
1 file modified
lib/lp/services/mailman/doc/postings.txt (+1/-1)
To merge this branch: bzr merge lp:~barry/launchpad/mm2112
Reviewer Review Type Date Requested Status
Henning Eggers (community) code Approve
Review via email: mp+13591@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :
Download full text (3.2 KiB)

 reviewer henninge

= Summary =

We need to upgrade our sourcecode/mailman to upstream Mailman 2.1.12 in order
to support Python 2.6. That will happen in a separate branch, however,
there's one test in the MailmanLayer that will fail after the upgrade. This
is because the From: address on rejection messages has changed from the
-bounces address to the -owner address.

== Proposed fix ==

Use ellipsis to make the test pass with either Mailman 2.1.10 (what we
currently have in sourcecode) and Mailman 2.1.12 (target for upgrade) so that
we can upgrade in a separate branch without disrupting the tests.

== Pre-implementation notes ==

None.

== Implementation details ==

None.

== Tests ==

% bin/test -vv --layer=MailmanLayer -t postings

== Demo and Q/A ==

None

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/services/mailman/doc/postings.txt

== Pyflakes Doctest notices ==

These are all bogus, due to globals in the doctest.

lib/lp/services/mailman/doc/postings.txt
    14: undefined name 'smtpd'
    35: undefined name 'vette_watcher'
    36: undefined name 'smtpd'
    73: undefined name 'vette_watcher'
    74: undefined name 'smtpd'
    88: undefined name 'smtpd'
    89: undefined name 'smtpd'
    99: undefined name 'vette_watcher'
    103: undefined name 'smtpd_watcher'
    104: undefined name 'smtpd'
    156: undefined name 'Browser'
    168: undefined name 'smtpd_watcher'
    169: undefined name 'smtpd'
    212: undefined name 'vette_watcher'
    213: undefined name 'smtpd'
    244: undefined name 'smtpd'
    259: undefined name 'vette_watcher'
    260: undefined name 'smtpd'
    306: undefined name 'smtpd_watcher'
    307: undefined name 'smtpd'
    378: undefined name 'smtpd_watcher'
    382: undefined name 'smtpd'
    405: undefined name 'mhonarc_watcher'
    434: undefined name 'smtpd_watcher'
    435: undefined name 'smtpd_watcher'
    436: undefined name 'smtpd'
    486: undefined name 'mhonarc_watcher'
    501: undefined name 'vette_watcher'
    502: undefined name 'smtpd'
    522: undefined name 'smtpd_watcher'
    523: undefined name 'smtpd_watcher'
    524: undefined name 'smtpd'
    595: undefined name 'vette_watcher'
    596: undefined name 'smtpd'
    639: undefined name 'smtpd_watcher'
    640: undefined name 'smtpd_watcher'
    641: undefined name 'smtpd'
    670: undefined name 'smtpd'
    686: undefined name 'vette_watcher'
    712: undefined name 'smtpd_watcher'
    713: undefined name 'smtpd_watcher'
    740: undefined name 'smtpd_watcher'
    741: undefined name 'smtpd_watcher'
    766: undefined name 'vette_watcher'
    781: undefined name 'smtpd_watcher'
    782: undefined name 'smtpd_watcher'
    786: undefined name 'smtpd'
    795: undefined name 'smtpd_watcher'
    796: undefined name 'smtpd_watcher'
    797: undefined name 'smtpd'
    832: undefined name 'vette_watcher'
    833: undefined name 'smtpd'
    857: undefined name 'vette_watcher'
    871: undefined name 'smtpd_watcher'
    872: undefined name 'smtpd_watcher'
    899: undefined name 'vette_watcher'
    927: undef...

Read more...

Revision history for this message
Henning Eggers (henninge) wrote :

What can I say? Thanks for the foresight!

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/services/mailman/doc/postings.txt'
2--- lib/lp/services/mailman/doc/postings.txt 2009-10-01 15:36:20 +0000
3+++ lib/lp/services/mailman/doc/postings.txt 2009-10-19 18:10:29 +0000
4@@ -173,7 +173,7 @@
5 MIME-Version: 1.0
6 ...
7 Subject: Request to mailing list Itest-one rejected
8- From: itest-one-bounces@lists.launchpad.dev
9+ From: itest-one-...@lists.launchpad.dev
10 To: anne.person@example.com
11 ...
12 Sender: itest-one-bounces+anne.person=example.com@lists.launchpad.dev