launchpad-reviewers team mailing list archive

[Colin Watson <mp+427614@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:fix-soss-packages-ui into launchpad:master.

Commit message:
Fix crash on Archive:+packages with non-Debian packages

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/427614

When non-Debian-format packages are published to archives via CI builds, they don't have a component or a section, since that only makes sense for Debian-format packages.  This caused the Archive:+packages page to crash.  Just leave the relevant cell empty in that case.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fix-soss-packages-ui into launchpad:master.

diff --git a/lib/lp/soyuz/browser/tests/test_archive_packages.py b/lib/lp/soyuz/browser/tests/test_archive_packages.py
index 4302bbf..68ea7b1 100644
--- a/lib/lp/soyuz/browser/tests/test_archive_packages.py
+++ b/lib/lp/soyuz/browser/tests/test_archive_packages.py
@@ -19,12 +19,14 @@ 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.registry.interfaces.sourcepackage import SourcePackageFileType
 from lp.services.beautifulsoup import BeautifulSoup
 from lp.services.webapp import canonical_url
 from lp.services.webapp.authentication import LaunchpadPrincipal
 from lp.soyuz.browser.archive import ArchiveNavigationMenu
-from lp.soyuz.enums import PackagePublishingStatus
+from lp.soyuz.enums import ArchiveRepositoryFormat, PackagePublishingStatus
 from lp.soyuz.interfaces.packagecopyjob import IPlainPackageCopyJobSource
+from lp.soyuz.interfaces.publishing import IPublishingSet
 from lp.testing import (
     RequestTimelineCollector,
     TestCaseWithFactory,
@@ -36,7 +38,11 @@ from lp.testing import (
 )
 from lp.testing.layers import DatabaseFunctionalLayer, LaunchpadFunctionalLayer
 from lp.testing.matchers import HasQueryCount
-from lp.testing.pages import get_feedback_messages
+from lp.testing.pages import (
+    extract_text,
+    find_tag_by_id,
+    get_feedback_messages,
+)
 from lp.testing.sampledata import ADMIN_EMAIL
 from lp.testing.views import create_initialized_view
 
@@ -353,6 +359,53 @@ class TestPPAPackages(TestCaseWithFactory):
         browser.open(url)
         self.assertThat(collector, HasQueryCount(Equals(expected_count)))
 
+    def test_ci_build_python_sdist(self):
+        # Publications for non-dsc/deb package types have no component or
+        # section.
+        ci_build = self.factory.makeCIBuild()
+        ppa = self.factory.makeArchive(
+            distribution=ci_build.distribution,
+            repository_format=ArchiveRepositoryFormat.PYTHON,
+        )
+        spn = self.factory.makeSourcePackageName()
+        spr = ci_build.createSourcePackageRelease(
+            distroseries=ci_build.distro_series,
+            sourcepackagename=spn,
+            version="0.1",
+            creator=ci_build.git_repository.owner,
+            archive=ppa,
+        )
+        lfa = self.factory.makeLibraryFileAlias(db_only=True)
+        spr.addFile(lfa, filetype=SourcePackageFileType.SDIST)
+        spph = getUtility(IPublishingSet).newSourcePublication(
+            archive=ppa,
+            sourcepackagerelease=spr,
+            distroseries=ci_build.distro_series,
+            pocket=PackagePublishingPocket.RELEASE,
+            creator=ci_build.git_repository.owner,
+            channel="edge",
+        )
+        distroseries_name = spph.distroseries.name
+        browser = self.getUserBrowser(
+            canonical_url(ppa, view_name="+packages")
+        )
+        package_table = find_tag_by_id(browser.contents, "packages_list")
+        [row] = package_table.tbody.find_all(
+            "tr", attrs={"class": "archive_package_row"}
+        )
+        self.assertEqual(
+            [
+                spr.title,
+                "",  # changes file
+                "",  # date published
+                "Pending",
+                distroseries_name.capitalize(),
+                "",  # section
+                "",  # build status summary
+            ],
+            [extract_text(cell) for cell in row.find_all("td")],
+        )
+
 
 class TestPPAPackagesJobNotifications(TestCaseWithFactory):
 
diff --git a/lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt b/lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt
index e3e447c..e1c44fe 100644
--- a/lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt
+++ b/lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt
@@ -51,7 +51,7 @@
     <td tal:content="structure context/datepublished/fmt:approximatedatetitle" />
     <td tal:content="context/status/title">PUBLISHED</td>
     <td tal:content="context/distroseries/name/capitalize">Dapper</td>
-    <td tal:content="context/section/name/capitalize">Web</td>
+    <td tal:content="context/section/name/capitalize|nothing">Web</td>
     <td tal:define="build_status_summary view/build_status_summary/status"
         tal:attributes="class string:build_status ${build_status_summary/name};
                         id string:pubstatus${context/id}">