Launchpad itself

Merge ~cjwatson/launchpad:fix-prevent-email-disclosure into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. fix-prevent-email-disclosure
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 73162fae916d60256136c35d70bf0a689a2efb5a
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:fix-prevent-email-disclosure
Merge into: launchpad:master
Diff against target: 39 lines (+12/-5)
1 file modified
lib/lp/registry/doc/distribution-mirror.txt (+12/-5)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+412708@code.launchpad.net

Commit message

Fix mirror notification doctests

Description of the change

These were broken by changes to prevent email address disclosure by sending notifications to different people in different emails.

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) wrote :

Thank you, Colin!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/registry/doc/distribution-mirror.txt b/lib/lp/registry/doc/distribution-mirror.txt
2index 8939a83..2c7cac5 100644
3--- a/lib/lp/registry/doc/distribution-mirror.txt
4+++ b/lib/lp/registry/doc/distribution-mirror.txt
5@@ -367,11 +367,14 @@ up on the public mirror listings.
6 >>> import email
7 >>> from lp.services.mail import stub
8 >>> len(stub.test_emails)
9- 2
10+ 3
11 >>> stub.test_emails.sort(key=lambda e: sorted(e[1])) # sort by to_addr
12 >>> from_addr, to_addrs, raw_message = stub.test_emails.pop(0)
13 >>> print(pretty(sorted(to_addrs)))
14- ['karl@canonical.com', 'mark@example.com']
15+ ['karl@canonical.com']
16+ >>> from_addr, to_addrs, raw_message = stub.test_emails.pop(0)
17+ >>> print(pretty(sorted(to_addrs)))
18+ ['mark@example.com']
19 >>> from_addr, to_addrs, raw_message = stub.test_emails.pop(0)
20 >>> print(pretty(sorted(to_addrs)))
21 ['mark@example.com']
22@@ -401,10 +404,14 @@ single notification to the distribution's mirror admins.
23 >>> valid_mirror.disable(notify_owner=False, log=log)
24 >>> transaction.commit()
25 >>> len(stub.test_emails)
26- 1
27- >>> from_addr, to_addrs, raw_message = stub.test_emails.pop()
28+ 2
29+ >>> stub.test_emails.sort(key=lambda e: sorted(e[1])) # sort by to_addr
30+ >>> from_addr, to_addrs, raw_message = stub.test_emails.pop(0)
31 >>> print(pretty(sorted(to_addrs)))
32- ['karl@canonical.com', 'mark@example.com']
33+ ['karl@canonical.com']
34+ >>> from_addr, to_addrs, raw_message = stub.test_emails.pop(0)
35+ >>> print(pretty(sorted(to_addrs)))
36+ ['mark@example.com']
37
38 Now we delete the MirrorProbeRecord we've just created, to make
39 sure this mirror is probed by our prober script.

Subscribers

People subscribed via source and target branches

to status/vote changes: