launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:fix-dmarc-for-merges-and-code into launchpad:master.

Commit message:
Fix TestBranchMergeDetectionHandler for DMARC-compliant addresses

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/406577
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fix-dmarc-for-merges-and-code into launchpad:master.

diff --git a/lib/lp/codehosting/scanner/tests/test_mergedetection.py b/lib/lp/codehosting/scanner/tests/test_mergedetection.py
index 2268ca8..fa5ecfc 100644
--- a/lib/lp/codehosting/scanner/tests/test_mergedetection.py
+++ b/lib/lp/codehosting/scanner/tests/test_mergedetection.py
@@ -302,8 +302,7 @@ class TestBranchMergeDetectionHandler(TestCaseWithFactory):
         self.assertIn(
             'Work in progress => Merged',
             six.ensure_text(notifications[0].get_payload(decode=True)))
-        self.assertEqual(
-            config.canonical.noreply_from_address, notifications[0]['From'])
+        self.assertEqual(proposal.address, notifications[0]['From'])
         recipients = set(msg['x-envelope-to'] for msg in notifications)
         expected = set(
             [proposal.source_branch.registrant.preferredemail.email,