Merge lp://staging/~gary/launchpad/bug650343-2 into lp://staging/launchpad

Proposed by Gary Poster
Status: Merged
Approved by: Leonard Richardson
Approved revision: no longer in the source branch.
Merged at revision: 11705
Proposed branch: lp://staging/~gary/launchpad/bug650343-2
Merge into: lp://staging/launchpad
Prerequisite: lp://staging/~gary/launchpad/bug650343
Diff against target: 666 lines (+133/-125)
10 files modified
cronscripts/process-mail.py (+2/-1)
lib/canonical/launchpad/doc/emailauthentication.txt (+7/-4)
lib/canonical/launchpad/ftests/test_system_documentation.py (+55/-77)
lib/canonical/launchpad/mail/handlers.py (+1/-1)
lib/lp/blueprints/doc/spec-mail-exploder.txt (+1/-1)
lib/lp/services/mail/incoming.py (+2/-2)
lib/lp/services/mail/tests/incomingmail.txt (+6/-6)
lib/lp/services/mail/tests/test_dkim.py (+31/-26)
lib/lp/services/mail/tests/test_incoming.py (+24/-2)
lib/lp/services/mail/tests/test_signedmessage.py (+4/-5)
To merge this branch: bzr merge lp://staging/~gary/launchpad/bug650343-2
Reviewer Review Type Date Requested Status
Leonard Richardson (community) Approve
Review via email: mp+38224@code.staging.launchpad.net

Commit message

Add X-Launchpad-Original-To to recipient lists; move some related files from c/l/mail to lp/services/mail.

Description of the change

In the reviews for https://code.edge.launchpad.net/~gary/launchpad/bug650343/+merge/37633 , I was asked to move the "incoming"-related files I touched over to lp/services/mail. This branch performs that move, and does the various changes that make lint then requests.

While we're speaking of lint, here's the output.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  cronscripts/process-mail.py
  lib/canonical/launchpad/doc/emailauthentication.txt
  lib/canonical/launchpad/ftests/test_system_documentation.py
  lib/canonical/launchpad/mail/handlers.py
  lib/lp/blueprints/doc/spec-mail-exploder.txt
  lib/lp/services/mail/incoming.py
  lib/lp/services/mail/tests/incomingmail.txt
  lib/lp/services/mail/tests/test_dkim.py
  lib/lp/services/mail/tests/test_incoming.py
  lib/lp/services/mail/tests/test_signedmessage.py

./cronscripts/process-mail.py
       9: '_pythonpath' imported but unused
./lib/canonical/launchpad/doc/emailauthentication.txt
     155: want exceeds 78 characters.

The ./cronscripts/process-mail.py request is because of our weird _pythonpath dance (maybe we should make these all buildout-generated scripts someday...or not). Anyway, it's not pertinent.

The request for ./lib/canonical/launchpad/doc/emailauthentication.txt appears to not be appropriate: the test explicitly turns off whitespace normalization there, so I think the long line is intended.

Tests passed on ec2 with the current branch, except for a Windmill error that appears to be spurious.

Other than that, the only thing I know to mention is that I did not move the files I touched for this move (lib/canonical/launchpad/doc/emailauthentication.txt lib/canonical/launchpad/ftests/test_system_documentation.py lib/canonical/launchpad/mail/handlers.py). Hopefully the move request does not have to cascade like that, or I may be at this for awhile. :-)

Thank you.

To post a comment you must log in.
Revision history for this message
Leonard Richardson (leonardr) wrote :

Good progress. Approved with minor changes discussed on IRC: reword "no signature is treated" and fix "message message" typo.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.