Launchpad itself

Merge ~cjwatson/launchpad:fix-dmarc-for-merges-and-code into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. fix-dmarc-for-merges-and-code
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: ebde447fb7229596a547801857d7c5163387c23a
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:fix-dmarc-for-merges-and-code
Merge into: launchpad:master
Diff against target: 14 lines (+1/-2)
1 file modified
lib/lp/codehosting/scanner/tests/test_mergedetection.py (+1/-2)
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Review via email: mp+406577@code.launchpad.net

Commit message

Fix TestBranchMergeDetectionHandler for DMARC-compliant addresses

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/codehosting/scanner/tests/test_mergedetection.py b/lib/lp/codehosting/scanner/tests/test_mergedetection.py
2index 2268ca8..fa5ecfc 100644
3--- a/lib/lp/codehosting/scanner/tests/test_mergedetection.py
4+++ b/lib/lp/codehosting/scanner/tests/test_mergedetection.py
5@@ -302,8 +302,7 @@ class TestBranchMergeDetectionHandler(TestCaseWithFactory):
6 self.assertIn(
7 'Work in progress => Merged',
8 six.ensure_text(notifications[0].get_payload(decode=True)))
9- self.assertEqual(
10- config.canonical.noreply_from_address, notifications[0]['From'])
11+ self.assertEqual(proposal.address, notifications[0]['From'])
12 recipients = set(msg['x-envelope-to'] for msg in notifications)
13 expected = set(
14 [proposal.source_branch.registrant.preferredemail.email,

Subscribers

People subscribed via source and target branches

to status/vote changes: