Merge ~pappacena/launchpad:pending-builds-msg-fix into launchpad:master

[Thiago F. Pappacena]

Fixing singular message "A recent upload has resulted in 1 pending builds."

[Colin Watson (cjwatson)]

This will work, but I'd like a slightly more idiomatic use of TAL, and it needs tests before it can be landed.

review: Needs Fixing

0015c19... by Thiago F. Pappacena on 2019-12-20

Merge branch 'pending-builds-msg-fix' of git+ssh://git.launchpad.net/~pappacena/launchpad into pending-builds-msg-fix

8ebb99f... by Thiago F. Pappacena on 2019-12-20

using macro for plural and adding tests

[Colin Watson (cjwatson)]

Mostly good, but let's make the test effective ...

review: Needs Fixing

e54b538... by Thiago F. Pappacena on 2020-01-06

fixing regex that tests pending builds message

[Colin Watson (cjwatson)]

review: Approve

diff --git a/lib/lp/soyuz/browser/tests/test_archive_packages.py b/lib/lp/soyuz/browser/tests/test_archive_packages.py
index c64ea8f..c199eec 100644
--- a/lib/lp/soyuz/browser/tests/test_archive_packages.py
+++ b/lib/lp/soyuz/browser/tests/test_archive_packages.py
@@ -24,6 +24,7 @@ from zope.security.interfaces import Unauthorized
 from zope.security.proxy import removeSecurityProxy
 
 from lp.app.utilities.celebrities import ILaunchpadCelebrities
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.beautifulsoup import BeautifulSoup4 as BeautifulSoup
 from lp.services.webapp import canonical_url
@@ -162,6 +163,42 @@ class TestPPAPackages(TestCaseWithFactory):
         self.assertNotifications(
             ppa, 'Publishing has been disabled for this archive.')
 
+    def test_page_show_singular_pending_builds(self):
+        ppa = self.factory.makeArchive()
+        self.factory.makeBinaryPackageBuild(
+            archive=ppa, status=BuildStatus.NEEDSBUILD)
+        owner = login_person(ppa.owner)
+        browser = self.getUserBrowser(
+            canonical_url(ppa) + '/+packages', user=owner)
+        html = browser.contents
+        pending_build_exists = soupmatchers.HTMLContains(
+            soupmatchers.Tag(
+                'pending build', 'p',
+                text=re.compile(r'(?s).*(pending\s*build\.)')),
+        )
+        self.assertThat(
+            html, pending_build_exists,
+            'Pending builds message was not found')
+
+    def test_page_show_plural_pending_builds(self):
+        ppa = self.factory.makeArchive()
+        self.factory.makeBinaryPackageBuild(
+            archive=ppa, status=BuildStatus.NEEDSBUILD)
+        self.factory.makeBinaryPackageBuild(
+            archive=ppa, status=BuildStatus.NEEDSBUILD)
+        owner = login_person(ppa.owner)
+        browser = self.getUserBrowser(
+            canonical_url(ppa) + '/+packages', user=owner)
+        html = browser.contents
+        pending_build_exists = soupmatchers.HTMLContains(
+            soupmatchers.Tag(
+                'pending build', 'p',
+                text=re.compile(r'(?s).*(pending\s*builds\.)')),
+        )
+        self.assertThat(
+            html, pending_build_exists,
+            'Pending builds message was not found')
+
     def test_ppa_packages_menu_is_enabled(self):
         joe = self.factory.makePerson()
         ppa = self.factory.makeArchive()
diff --git a/lib/lp/soyuz/templates/archive-macros.pt b/lib/lp/soyuz/templates/archive-macros.pt
index 845eabf..7099c2f 100644
--- a/lib/lp/soyuz/templates/archive-macros.pt
+++ b/lib/lp/soyuz/templates/archive-macros.pt
@@ -269,11 +269,15 @@ div.package-details {
         failed</dd>
     </dl>
 
-  <p tal:condition="view/build_counters/pending">
+  <p tal:define="count view/build_counters/pending;
+                 singular string:build;
+                 plural string:builds"
+     tal:condition="count">
     A recent upload has resulted in
     <span class="build-count pending"
           tal:content="view/build_counters/pending">100</span>
-    pending builds.
+    pending
+    <metal:builds use-macro="context/@@+base-layout-macros/plural-message" />.
   </p>
   </div>
 </metal:build_status_summary>