Merge lp:~michael.nelson/launchpad/591010-locationerror-related-packages into lp:launchpad

[Michael Nelson]

Please review my branch:

   bzr+ssh://bazaar.launchpad.net/~michael.nelson/launchpad/591010-locationerror-related-packages

revision 10980.

Demo URL: Demonstrating just shows that the page doesn't oops, but if you're
really keen, you can view the page with the correct data by
putting a breakpoint at the end of the test and then running `make
LPCONFIG=testrunner run`. In the debugger, get the user name with
`self.user.name` and plug that in to:

https://launchpad.dev/~<user-name>/+related-software

Test command: bin/test -vv -m test_person_view -t
TestPersonRelatedSoftwareFailedBuild

The two template fixes are one-liners, creating the tests was a bit confusing.
To reproduce the problem required publishing a package in the users PPA, but
with a build built in the context of a distro archive (ie. as if it had been
copied out). I created an XXX with an associated bug:
https://bugs.edge.launchpad.net/soyuz/+bug/592050

but for the moment just ensured the oops is fixed (so this can be CP'd if
necessary).

[Jelmer Vernooij (jelmer)]

review: Approve (code)

[Jelmer Vernooij (jelmer)]

The buildmaster import seems somewhat out of place, I would expect it to sort before all of the registry imports.

[Michael Nelson (michael.nelson)]

Woops... when cleaning up the stray registry import, I'd then placed it out of order again. Updated. Thanks!

=== modified file 'lib/lp/registry/browser/tests/test_person_view.py'
--- lib/lp/registry/browser/tests/test_person_view.py	2010-06-07 21:37:52 +0000
+++ lib/lp/registry/browser/tests/test_person_view.py	2010-06-10 10:29:35 +0000
@@ -10,10 +10,11 @@
 
 from canonical.launchpad.ftests import ANONYMOUS, login
 from canonical.launchpad.webapp.interfaces import NotFoundError
-from lp.registry.interfaces.karma import IKarmaCacheManager
 from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 from canonical.testing import (
     DatabaseFunctionalLayer, LaunchpadFunctionalLayer, LaunchpadZopelessLayer)
+from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.registry.interfaces.karma import IKarmaCacheManager
 from lp.registry.browser.person import PersonEditView, PersonView
 from lp.registry.interfaces.person import PersonVisibility
 from lp.registry.interfaces.teammembership import TeamMembershipStatus
@@ -337,5 +338,50 @@
         self.assertEqual(True, self.view.has_participations)
 
 
+class TestPersonRelatedSoftwareFailedBuild(TestCaseWithFactory):
+    """The related software views display links to failed builds."""
+
+    layer = LaunchpadFunctionalLayer
+
+    def setUp(self):
+        super(TestPersonRelatedSoftwareFailedBuild, self).setUp()
+        self.user = self.factory.makePerson()
+
+        # First we need to publish some PPA packages with failed builds
+        # for this person.
+        # XXX michaeln 2010-06-10 bug=592050.
+        # Strangely, the builds need to be built in the context of a
+        # main archive to reproduce bug 591010 for which this test was
+        # written to demonstrate.
+        login('[e-mail]')
+        publisher = SoyuzTestPublisher()
+        publisher.prepareBreezyAutotest()
+        ppa = self.factory.makeArchive(owner=self.user)
+        src_pub = publisher.getPubSource(
+            creator=self.user, maintainer=self.user, archive=ppa)
+        binaries = publisher.getPubBinaries(
+            pub_source=src_pub)
+        self.build = binaries[0].binarypackagerelease.build
+        self.build.status = BuildStatus.FAILEDTOBUILD
+        self.build.archive = publisher.distroseries.main_archive
+        login(ANONYMOUS)
+
+    def test_related_software_with_failed_build(self):
+        # The link to the failed build is displayed.
+        self.view = create_view(self.user, name='+related-software')
+        html = self.view()
+        self.assertTrue(
+            '<a href="/ubuntutest/+source/foo/666/+build/%d">i386</a>' % (
+                self.build.id) in html)
+
+    def test_related_ppa_packages_with_failed_build(self):
+        # The link to the failed build is displayed.
+        self.view = create_view(self.user, name='+ppa-packages')
+        html = self.view()
+        self.assertTrue(
+            '<a href="/ubuntutest/+source/foo/666/+build/%d">i386</a>' % (
+                self.build.id) in html)
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/registry/templates/person-related-software.pt'
--- lib/lp/registry/templates/person-related-software.pt	2009-09-08 14:37:17 +0000
+++ lib/lp/registry/templates/person-related-software.pt	2010-06-10 10:29:35 +0000
@@ -187,7 +187,7 @@
       <tal:block condition="not: spr/needs_building">
           <tal:block repeat="build spr/failed_builds">
              <a tal:attributes="href build/fmt:url"
-                tal:content="build/distroarchseries/architecturetag" />
+                tal:content="build/distro_arch_series/architecturetag" />
           </tal:block>
           <tal:block condition="not: spr/failed_builds">
              None

=== modified file 'lib/lp/soyuz/templates/person-ppa-packages.pt'
--- lib/lp/soyuz/templates/person-ppa-packages.pt	2009-09-08 14:37:17 +0000
+++ lib/lp/soyuz/templates/person-ppa-packages.pt	2010-06-10 10:29:35 +0000
@@ -88,7 +88,7 @@
       <tal:block condition="not: spr/needs_building">
           <tal:block repeat="build spr/failed_builds">
              <a tal:attributes="href build/fmt:url"
-                tal:content="build/distroarchseries/architecturetag" />
+                tal:content="build/distro_arch_series/architecturetag" />
           </tal:block>
           <tal:block condition="not: spr/failed_builds">
              None