Merge ~twom/launchpad:email-ppa-changes into launchpad:master

[Tom Wardill]

Don't send packageupload mails to non main archive lists

lp: #1929243

[Colin Watson (cjwatson)]

review: Approve

44c5569... by Tom Wardill on 2021-07-02

Drop redundant is_ppa check

c5ff0d5... by Tom Wardill on 2021-07-02

Move tests to a better location

diff --git a/lib/lp/soyuz/mail/packageupload.py b/lib/lp/soyuz/mail/packageupload.py
index a5686a1..e6986aa 100644
--- a/lib/lp/soyuz/mail/packageupload.py
+++ b/lib/lp/soyuz/mail/packageupload.py
@@ -391,7 +391,7 @@ class PackageUploadMailer(BaseMailer):
         # announce if possible. Avoid announcing backports, binary-only
         # security uploads, or autosync uploads.
         if (action == 'accepted' and distroseries.changeslist
-                and not archive.is_ppa
+                and archive.is_main
                 and pocket != PackagePublishingPocket.BACKPORTS
                 and not (
                     pocket == PackagePublishingPocket.SECURITY and spr is None)
diff --git a/lib/lp/soyuz/mail/tests/test_packageupload.py b/lib/lp/soyuz/mail/tests/test_packageupload.py
index 3e9c0b1..c7378f9 100644
--- a/lib/lp/soyuz/mail/tests/test_packageupload.py
+++ b/lib/lp/soyuz/mail/tests/test_packageupload.py
@@ -484,6 +484,60 @@ class TestNotification(TestCaseWithFactory):
             [blamer, changer], changes, blamer, maintainer, changer,
             purpose=ArchivePurpose.PPA)
 
+    def test_getRecipientsForAction_primary(self):
+        blamer, maintainer, changer = self._setup_recipients()
+        changes = {
+            'Date': b'2001-01-01',
+            'Changed-By': b'Changer <[e-mail]>',
+            'Maintainer': b'Maintainer <[e-mail]>',
+            'Changes': b' * Foo!',
+            }
+        distribution = self.factory.makeDistribution()
+        archive = self.factory.makeArchive(
+            distribution=distribution, purpose=ArchivePurpose.PRIMARY)
+        distroseries = self.factory.makeDistroSeries(distribution=distribution)
+        distroseries.changeslist = "[e-mail]"
+        # Now set the uploaders.
+        component = getUtility(IComponentSet).ensure('main')
+        if component not in distroseries.components:
+            self.factory.makeComponentSelection(
+                distroseries=distroseries, component=component)
+        distribution.main_archive.newComponentUploader(maintainer, component)
+        distribution.main_archive.newComponentUploader(changer, component)
+        info = fetch_information(None, None, changes)
+        observed, _ = PackageUploadMailer.getRecipientsForAction(
+            'accepted', info, blamer, None, [], archive, distroseries,
+            PackagePublishingPocket.RELEASE)
+        email_addresses = [x.preferredemail.email for x in observed.keys()]
+        self.assertIn("[e-mail]", email_addresses)
+
+    def test_getRecipientsForAction_copy(self):
+        blamer, maintainer, changer = self._setup_recipients()
+        changes = {
+            'Date': b'2001-01-01',
+            'Changed-By': b'Changer <[e-mail]>',
+            'Maintainer': b'Maintainer <[e-mail]>',
+            'Changes': b' * Foo!',
+            }
+        distribution = self.factory.makeDistribution()
+        archive = self.factory.makeArchive(
+            distribution=distribution, purpose=ArchivePurpose.COPY)
+        distroseries = self.factory.makeDistroSeries(distribution=distribution)
+        distroseries.changeslist = "[e-mail]"
+        # Now set the uploaders.
+        component = getUtility(IComponentSet).ensure('main')
+        if component not in distroseries.components:
+            self.factory.makeComponentSelection(
+                distroseries=distroseries, component=component)
+        distribution.main_archive.newComponentUploader(maintainer, component)
+        distribution.main_archive.newComponentUploader(changer, component)
+        info = fetch_information(None, None, changes)
+        observed, _ = PackageUploadMailer.getRecipientsForAction(
+            'accepted', info, blamer, None, [], archive, distroseries,
+            PackagePublishingPocket.RELEASE)
+        email_addresses = [x.preferredemail.email for x in observed.keys()]
+        self.assertNotIn("[e-mail]", email_addresses)
+
     def test__getHeaders_primary(self):
         # _getHeaders returns useful values for headers used for filtering.
         # For a primary archive, this includes the maintainer and changer.