Merge lp:~thumper/launchpad/fix-recipe-build-oops into lp:launchpad

[Tim Penhey]

[r=julian-edwards,mwhudson,stevenk][ui=none][bug=692814] Make recipe builds live under the archive, not the recipe.

This change updates the canonical_url for a source package recipe build. Prior to this change
the build lived under the recipe itself. However to maintain some traceability of builds
we now allow the builds to exist for deleted recipes. This made them very hard to traverse
to. The solution is to move the builds under the archive, just like the binary package builds.

However to have them co-exist, I needed to change the integral identifier at the end of the +build
to be the build farm job id, rather than the build id itself.

[Steve Kowalik (stevenk)]

This looks like a good change, thanks.

review: Approve (code*)

[Michael Hudson-Doyle (mwhudson)]

The code seems perfectly fine.

The only issue is the changing of the urls of all builds, it seems to be an open question about whether that's important so I'll leave it up to you :-)

review: Approve

[Tim Penhey (thumper)]

Code has been updated to use +buildjob for the new urls and adding redirects for the old +build urls.

[Julian Edwards (julian-edwards)]

Looking pretty good, thanks for the change Tim. There's just a couple of comments I have:

1. Can you change /builders/buildjob/NNNN to /builders/+buildjob/NNNNN so that it's consistent with /builders/+build/NNNNN

Sorry, you can blame me for getting this wrong since I missed the "+" in the email.

2. The stepthrough('+buildjob') code looks like it can be refactored somewhere, the same code is in three different places.

Cheers
J

review: Needs Fixing (code)

[Tim Penhey (thumper)]

Done.

Also fixed a bunch of test failures that referred to the old urls.

[Julian Edwards (julian-edwards)]

Looks good!

Can you add the + to buildjob on lines 657 and 668 of the diff and you're good to land.

review: Approve (code)

=== modified file 'lib/canonical/launchpad/doc/canonical_url_examples.txt'
--- lib/canonical/launchpad/doc/canonical_url_examples.txt	2010-10-19 18:44:31 +0000
+++ lib/canonical/launchpad/doc/canonical_url_examples.txt	2011-01-14 10:09:39 +0000
@@ -380,15 +380,3 @@
 
     >>> canonical_url(celebs.ubuntu.getSpecification('media-integrity-check'))
     u'http://blueprints.launchpad.dev/ubuntu/+spec/media-integrity-check'
-
-
-SourcePackageRecipes
-====================
-
-    >>> recipe = factory.makeSourcePackageRecipe()
-    >>> canonical_url(recipe)
-    u'http://code.launchpad.dev/~person-name.../+recipe/generic-string...'
-
-    >>> build = factory.makeSourcePackageRecipeBuild(recipe=recipe)
-    >>> canonical_url(build)
-    u'http://code.launchpad.dev/~person-name.../+recipe/generic-string.../+build/...'

=== modified file 'lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt'
--- lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt	2011-01-04 16:08:57 +0000
+++ lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt	2011-01-14 10:09:39 +0000
@@ -404,7 +404,6 @@
 >>> check("/builders")
 >>> check("/builders/bob/")
 >>> check_redirect("/+builds", status=301)
->>> check("/ubuntu/+source/pmount/0.1-1/+build/7/")
 
 >>> check_redirect("/support/", status=301)
 

=== modified file 'lib/lp/app/browser/tales.py'
--- lib/lp/app/browser/tales.py	2011-01-11 01:09:43 +0000
+++ lib/lp/app/browser/tales.py	2011-01-14 10:09:39 +0000
@@ -1651,10 +1651,15 @@
 class SourcePackageRecipeBuildFormatterAPI(CustomizableFormatter):
     """Adapter providing fmt support for ISourcePackageRecipe objects."""
 
-    _link_summary_template = '%(name)s recipe build [%(owner)s/%(archive)s]'
+    _link_summary_template = '%(name)s [%(owner)s/%(archive)s]'
 
     def _link_summary_values(self):
-        return {'name': self._context.recipe.base_branch.unique_name,
+        if self._context.recipe is None:
+            name = 'build for deleted recipe'
+        else:
+            branch_name = self._context.recipe.base_branch.unique_name
+            name = '%s recipe build' % branch_name
+        return {'name': name,
                 'owner': self._context.archive.owner.name,
                 'archive': self._context.archive.name}
 

=== modified file 'lib/lp/buildmaster/interfaces/packagebuild.py'
--- lib/lp/buildmaster/interfaces/packagebuild.py	2010-11-16 10:55:23 +0000
+++ lib/lp/buildmaster/interfaces/packagebuild.py	2011-01-14 10:09:39 +0000
@@ -37,6 +37,10 @@
 
     id = Attribute('The package build ID.')
 
+    url_id = Attribute(
+        'A unique identifier for accessing the builds. '
+        'Used for the canonical_url generation.')
+
     archive = exported(
         Reference(
             title=_('Archive'), schema=IArchive,

=== modified file 'lib/lp/buildmaster/model/packagebuild.py'
--- lib/lp/buildmaster/model/packagebuild.py	2011-01-07 00:23:44 +0000
+++ lib/lp/buildmaster/model/packagebuild.py	2011-01-14 10:09:39 +0000
@@ -94,6 +94,10 @@
     build_farm_job_id = Int(name='build_farm_job', allow_none=False)
     build_farm_job = Reference(build_farm_job_id, 'BuildFarmJob.id')
 
+    @property
+    def url_id(self):
+        return self.build_farm_job_id
+
     # The following two properties are part of the IPackageBuild
     # interface, but need to be provided by derived classes.
     distribution = None

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2010-12-15 06:47:38 +0000
+++ lib/lp/code/browser/configure.zcml	2011-01-14 10:09:39 +0000
@@ -1195,17 +1195,14 @@
         rootsite="code" />
     <browser:url
         for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
-        attribute_to_parent="recipe"
-        path_expression="string:+build/${id}"
-        rootsite="code" />
+        attribute_to_parent="archive"
+        path_expression="string:+buildjob/${url_id}"
+        />
     <browser:menus
         classes="SourcePackageRecipeBuildContextMenu"
         module="lp.code.browser.sourcepackagerecipebuild"/>
 
     <browser:navigation
-        module="lp.code.browser.sourcepackagerecipe"
-        classes="SourcePackageRecipeNavigation" />
-    <browser:navigation
         module="lp.code.browser.sourcepackagerecipebuild"
         classes="SourcePackageRecipeBuildNavigation" />
 
@@ -1234,24 +1231,21 @@
         <browser:defaultView
             for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
             name="+index"
-            layer="lp.code.publisher.CodeLayer"/>
+            />
         <browser:page
             for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
-            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.sourcepackagerecipebuild.SourcePackageRecipeBuildView"
             name="+index"
             template="../templates/sourcepackagerecipebuild-index.pt"
             permission="launchpad.View"/>
         <browser:page
             for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
-            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.sourcepackagerecipebuild.SourcePackageRecipeBuildCancelView"
             name="+cancel"
             template="../../app/templates/generic-edit.pt"
             permission="launchpad.Admin"/>
         <browser:page
             for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
-            layer="lp.code.publisher.CodeLayer"
             class="lp.code.browser.sourcepackagerecipebuild.SourcePackageRecipeBuildRescoreView"
             name="+rescore"
             template="../../app/templates/generic-edit.pt"

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2011-01-14 05:46:14 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2011-01-14 10:09:39 +0000
@@ -144,17 +144,6 @@
             yield item
 
 
-class SourcePackageRecipeNavigation(Navigation):
-    """Navigation from the SourcePackageRecipe."""
-
-    usedfor = ISourcePackageRecipe
-
-    @stepthrough('+build')
-    def traverse_build(self, id):
-        """Traverse to this recipe's builds."""
-        return getUtility(ISourcePackageRecipeBuildSource).getById(int(id))
-
-
 class SourcePackageRecipeNavigationMenu(NavigationMenu):
     """Navigation menu for sourcepackage recipes."""
 

=== modified file 'lib/lp/code/browser/sourcepackagerecipebuild.py'
--- lib/lp/code/browser/sourcepackagerecipebuild.py	2010-11-26 00:29:09 +0000
+++ lib/lp/code/browser/sourcepackagerecipebuild.py	2011-01-14 10:09:39 +0000
@@ -43,6 +43,7 @@
     BuildStatus.SUPERSEDED,
     BuildStatus.FAILEDTOUPLOAD,)
 
+
 class SourcePackageRecipeBuildNavigation(Navigation, FileNavigationMixin):
 
     usedfor = ISourcePackageRecipeBuild

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2011-01-14 05:46:14 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2011-01-14 10:09:39 +0000
@@ -52,12 +52,26 @@
     BrowserTestCase,
     login,
     person_logged_in,
+    TestCaseWithFactory,
     time_counter,
     )
 from lp.testing.factory import remove_security_proxy_and_shout_at_engineer
 from lp.testing.views import create_initialized_view
 
 
+class TestCanonicalUrlForRecipe(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def test_canonical_url(self):
+        owner = self.factory.makePerson(name='recipe-owner')
+        recipe = self.factory.makeSourcePackageRecipe(
+            owner=owner, name=u'recipe-name')
+        self.assertEqual(
+            'http://code.launchpad.dev/~recipe-owner/+recipe/recipe-name',
+            canonical_url(recipe))
+
+
 class TestCaseForRecipe(BrowserTestCase):
     """Create some sample data for recipe tests."""
 
@@ -1237,8 +1251,7 @@
         """Test the basic index page."""
         main_text = self.getMainText(self.makeBuild(), '+index')
         self.assertTextMatchesExpressionIgnoreWhitespace("""\
-            Code
-            my-recipe
+            Owner PPA named build for Owner
             created .*
             Build status
             Needs building
@@ -1268,8 +1281,7 @@
         main_text = self.getMainText(
             release.source_package_recipe_build, '+index')
         self.assertTextMatchesExpressionIgnoreWhitespace("""\
-            Code
-            my-recipe
+            Owner PPA named build for Owner
             created .*
             Build status
             Successfully built

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py	2010-10-04 19:50:45 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py	2011-01-14 10:09:39 +0000
@@ -8,6 +8,7 @@
 
 from mechanize import LinkNotFoundError
 from storm.locals import Store
+from testtools.matchers import StartsWith
 import transaction
 from zope.component import getUtility
 from zope.security.interfaces import Unauthorized
@@ -28,9 +29,24 @@
     BrowserTestCase,
     login,
     logout,
+    TestCaseWithFactory,
     )
 
 
+class TestCanonicalUrlForRecipeBuild(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def test_canonical_url(self):
+        owner = self.factory.makePerson(name='ppa-owner')
+        ppa = self.factory.makeArchive(owner=owner, name='ppa')
+        build = self.factory.makeSourcePackageRecipeBuild(archive=ppa)
+        self.assertThat(
+            canonical_url(build),
+            StartsWith(
+                'http://launchpad.dev/~ppa-owner/+archive/ppa/+buildjob/'))
+
+
 class TestSourcePackageRecipeBuild(BrowserTestCase):
     """Create some sample data for recipe tests."""
 

=== modified file 'lib/lp/code/browser/tests/test_tales.py'
--- lib/lp/code/browser/tests/test_tales.py	2010-10-04 19:50:45 +0000
+++ lib/lp/code/browser/tests/test_tales.py	2011-01-14 10:09:39 +0000
@@ -9,12 +9,16 @@
 import unittest
 
 from storm.store import Store
+from testtools.matchers import Equals
+from zope.component import queryAdapter
 from zope.security.proxy import removeSecurityProxy
+from zope.traversing.interfaces import IPathAdapter
 
 from canonical.launchpad.webapp.publisher import canonical_url
 from canonical.testing.layers import LaunchpadFunctionalLayer
 from lp.testing import (
     login,
+    person_logged_in,
     test_tales,
     TestCaseWithFactory,
     )
@@ -174,6 +178,39 @@
             diff.diff_text.getURL(), test_tales('diff/fmt:url', diff=diff))
 
 
+class TestSourcePackageRecipeBuild(TestCaseWithFactory):
+    """Test the formatter for SourcePackageRecipeBuilds."""
+
+    layer = LaunchpadFunctionalLayer
+
+    def test_link(self):
+        eric = self.factory.makePerson(name='eric')
+        ppa = self.factory.makeArchive(owner=eric, name='ppa')
+        build = self.factory.makeSourcePackageRecipeBuild(
+            archive=ppa)
+        adapter = queryAdapter(build, IPathAdapter, 'fmt')
+        self.assertThat(
+            adapter.link(None),
+            Equals(
+                '<a href="%s">%s recipe build [eric/ppa]</a>'
+                % (canonical_url(build, path_only_if_possible=True),
+                   build.recipe.base_branch.unique_name)))
+
+    def test_link_no_recipe(self):
+        eric = self.factory.makePerson(name='eric')
+        ppa = self.factory.makeArchive(owner=eric, name='ppa')
+        build = self.factory.makeSourcePackageRecipeBuild(
+            archive=ppa)
+        with person_logged_in(build.recipe.owner):
+            build.recipe.destroySelf()
+        adapter = queryAdapter(build, IPathAdapter, 'fmt')
+        self.assertThat(
+            adapter.link(None),
+            Equals(
+                '<a href="%s">build for deleted recipe [eric/ppa]</a>'
+                % (canonical_url(build, path_only_if_possible=True), )))
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 

=== modified file 'lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py	2010-12-08 17:22:23 +0000
+++ lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py	2011-01-14 10:09:39 +0000
@@ -12,6 +12,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.config import config
+from canonical.launchpad.webapp import canonical_url
 from canonical.testing.layers import LaunchpadFunctionalLayer
 from lp.buildmaster.enums import BuildStatus
 from lp.code.mail.sourcepackagerecipebuild import (
@@ -73,9 +74,9 @@
         body, footer = ctrl.body.split('\n-- \n')
         self.assertEqual(
             expected_body % build.log.getURL(), body)
+        build_url = canonical_url(build)
         self.assertEqual(
-            'http://code.launchpad.dev/~person/+recipe/recipe/+build/1\n'
-            'You are the requester of the build.\n', footer)
+            '%s\nYou are the requester of the build.\n' % build_url, footer)
         self.assertEqual(
             config.canonical.noreply_from_address, ctrl.from_addr)
         self.assertEqual(
@@ -104,9 +105,9 @@
             'Build for superseded Source' % (build.id), ctrl.subject)
         body, footer = ctrl.body.split('\n-- \n')
         self.assertEqual(superseded_body, body)
+        build_url = canonical_url(build)
         self.assertEqual(
-            'http://code.launchpad.dev/~person/+recipe/recipe/+build/1\n'
-            'You are the requester of the build.\n', footer)
+            '%s\nYou are the requester of the build.\n' % build_url, footer)
         self.assertEqual(
             config.canonical.noreply_from_address, ctrl.from_addr)
         self.assertEqual(

=== modified file 'lib/lp/registry/browser/tests/test_person_view.py'
--- lib/lp/registry/browser/tests/test_person_view.py	2010-11-23 11:54:09 +0000
+++ lib/lp/registry/browser/tests/test_person_view.py	2011-01-14 10:09:39 +0000
@@ -663,16 +663,16 @@
         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)
+            '<a href="/ubuntutest/+source/foo/666/+buildjob/%d">i386</a>' % (
+                self.build.url_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)
+            '<a href="/ubuntutest/+source/foo/666/+buildjob/%d">i386</a>' % (
+                self.build.url_id) in html)
 
 
 class TestPersonDeactivateAccountView(TestCaseWithFactory):

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2011-01-13 17:23:57 +0000
+++ lib/lp/soyuz/browser/archive.py	2011-01-14 10:09:39 +0000
@@ -117,7 +117,10 @@
 from lp.soyuz.adapters.archivesourcepublication import (
     ArchiveSourcePublications,
     )
-from lp.soyuz.browser.build import BuildRecordsView
+from lp.soyuz.browser.build import (
+    BuildNavigationMixin,
+    BuildRecordsView,
+    )
 from lp.soyuz.browser.sourceslist import (
     SourcesListEntries,
     SourcesListEntriesView,
@@ -137,10 +140,7 @@
     )
 from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
 from lp.soyuz.interfaces.archivesubscriber import IArchiveSubscriberSet
-from lp.soyuz.interfaces.binarypackagebuild import (
-    BuildSetStatus,
-    IBinaryPackageBuildSet,
-    )
+from lp.soyuz.interfaces.binarypackagebuild import BuildSetStatus
 from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.packagecopyrequest import IPackageCopyRequestSet
@@ -220,22 +220,12 @@
         return u"+archive/%s" % self.context.name
 
 
-class ArchiveNavigation(Navigation, FileNavigationMixin):
+class ArchiveNavigation(Navigation, FileNavigationMixin,
+                        BuildNavigationMixin):
     """Navigation methods for IArchive."""
 
     usedfor = IArchive
 
-    @stepthrough('+build')
-    def traverse_build(self, name):
-        try:
-            build_id = int(name)
-        except ValueError:
-            return None
-        try:
-            return getUtility(IBinaryPackageBuildSet).getByBuildID(build_id)
-        except NotFoundError:
-            return None
-
     @stepthrough('+sourcepub')
     def traverse_sourcepub(self, name):
         return self._traverse_publication(name, source=True)

=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py	2011-01-12 13:15:28 +0000
+++ lib/lp/soyuz/browser/build.py	2011-01-14 10:09:39 +0000
@@ -9,6 +9,7 @@
     'BuildBreadcrumb',
     'BuildContextMenu',
     'BuildNavigation',
+    'BuildNavigationMixin',
     'BuildRecordsView',
     'BuildRescoringView',
     'BuildUrl',
@@ -32,6 +33,7 @@
     LaunchpadView,
     Link,
     StandardLaunchpadFacets,
+    stepthrough,
     )
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.batching import BatchNavigator
@@ -42,8 +44,12 @@
     action,
     LaunchpadFormView,
     )
-from lp.app.errors import UnexpectedFormData
+from lp.app.errors import (
+    NotFoundError,
+    UnexpectedFormData,
+    )
 from lp.buildmaster.enums import BuildStatus
+from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobSet
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.propertycache import cachedproperty
 from lp.soyuz.enums import PackageUploadStatus
@@ -84,13 +90,42 @@
 
     @property
     def path(self):
-        return u"+build/%d" % self.context.id
+        return u"+buildjob/%d" % self.context.url_id
 
 
 class BuildNavigation(GetitemNavigation, FileNavigationMixin):
     usedfor = IBinaryPackageBuild
 
 
+class BuildNavigationMixin:
+    """Provide a simple way to traverse to builds."""
+
+    @stepthrough('+build')
+    def traverse_build(self, name):
+        try:
+            build_id = int(name)
+        except ValueError:
+            return None
+        try:
+            build = getUtility(IBinaryPackageBuildSet).getByBuildID(build_id)
+        except NotFoundError:
+            return None
+        else:
+            return self.redirectSubTree(canonical_url(build))
+
+    @stepthrough('+buildjob')
+    def traverse_buildjob(self, name):
+        try:
+            job_id = int(name)
+        except ValueError:
+            return None
+        try:
+            build_job = getUtility(IBuildFarmJobSet).getByID(job_id)
+            return build_job.getSpecificJob()
+        except NotFoundError:
+            return None
+
+
 class BuildFacets(StandardLaunchpadFacets):
     """The links that will appear in the facet menu for an
     IBinaryPackageBuild."""

=== modified file 'lib/lp/soyuz/browser/builder.py'
--- lib/lp/soyuz/browser/builder.py	2010-11-23 23:22:27 +0000
+++ lib/lp/soyuz/browser/builder.py	2011-01-14 10:09:39 +0000
@@ -49,29 +49,25 @@
     LaunchpadEditFormView,
     LaunchpadFormView,
     )
-from lp.app.errors import NotFoundError
 from lp.buildmaster.interfaces.builder import (
     IBuilder,
     IBuilderSet,
     )
 from lp.services.propertycache import cachedproperty
-from lp.soyuz.browser.build import BuildRecordsView
-from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
-
-
-class BuilderSetNavigation(GetitemNavigation):
+from lp.soyuz.browser.build import (
+    BuildNavigationMixin,
+    BuildRecordsView,
+    )
+
+
+class BuilderSetNavigation(GetitemNavigation, BuildNavigationMixin):
     """Navigation methods for IBuilderSet."""
     usedfor = IBuilderSet
 
-    @stepthrough('+build')
-    def traverse_build(self, name):
-        try:
-            build_id = int(name)
-        except ValueError:
-            return None
-        try:
-            build = getUtility(IBinaryPackageBuildSet).getByBuildID(build_id)
-        except NotFoundError:
+    @stepthrough('+buildjob')
+    def traverse_buildjob(self, name):
+        build = super(BuilderSetNavigation, self).traverse_buildjob(name)
+        if build is None:
             return None
         else:
             return self.redirectSubTree(canonical_url(build))

=== modified file 'lib/lp/soyuz/browser/distributionsourcepackagerelease.py'
--- lib/lp/soyuz/browser/distributionsourcepackagerelease.py	2010-08-31 11:31:04 +0000
+++ lib/lp/soyuz/browser/distributionsourcepackagerelease.py	2011-01-14 10:09:39 +0000
@@ -12,21 +12,17 @@
 
 import operator
 
-from zope.component import getUtility
-
 from canonical.launchpad.browser.librarian import ProxiedLibraryFileAlias
 from canonical.launchpad.webapp import (
     LaunchpadView,
     Navigation,
-    stepthrough,
     )
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.lazr.utils import smartquote
-from lp.app.errors import NotFoundError
 from lp.archivepublisher.debversion import Version
 from lp.services.propertycache import cachedproperty
+from lp.soyuz.browser.build import BuildNavigationMixin
 from lp.soyuz.enums import PackagePublishingStatus
-from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.interfaces.distributionsourcepackagerelease import (
     IDistributionSourcePackageRelease,
     )
@@ -40,20 +36,10 @@
         return self.context.version
 
 
-class DistributionSourcePackageReleaseNavigation(Navigation):
+class DistributionSourcePackageReleaseNavigation(Navigation,
+                                                 BuildNavigationMixin):
     usedfor = IDistributionSourcePackageRelease
 
-    @stepthrough('+build')
-    def traverse_build(self, name):
-        try:
-            build_id = int(name)
-        except ValueError:
-            return None
-        try:
-            return getUtility(IBinaryPackageBuildSet).getByBuildID(build_id)
-        except NotFoundError:
-            return None
-
 
 class DistributionSourcePackageReleaseView(LaunchpadView):
     """View logic for `DistributionSourcePackageRelease` objects. """

=== modified file 'lib/lp/soyuz/browser/tests/build-views.txt'
--- lib/lp/soyuz/browser/tests/build-views.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/soyuz/browser/tests/build-views.txt	2011-01-14 10:09:39 +0000
@@ -300,7 +300,7 @@
     >>> view.request.response.getStatus()
     302
     >>> print view.request.response.getHeader('Location')
-    http://launchpad.dev/~cprov/+archive/ppa/+build/26
+    http://launchpad.dev/~cprov/+archive/ppa/+buildjob/26
 
 Canceled 'Rescore' form redirects users back to the Build page.
 
@@ -312,7 +312,7 @@
     ...    pending_build, name="+rescore")
 
     >>> print view.cancel_url
-    http://launchpad.dev/ubuntu/+source/alsa-utils/1.0.9a-4ubuntu1/+build/11
+    http://launchpad.dev/ubuntu/+source/alsa-utils/1.0.9a-4ubuntu1/+buildjob/11
 
 The 'priority' field only accepts long integer values.
 
@@ -351,7 +351,7 @@
     >>> view.request.response.getStatus()
     302
     >>> print view.request.response.getHeader('Location')
-    http://launchpad.dev/ubuntu/+source/alsa-utils/1.0.9a-4ubuntu1/+build/11
+    http://launchpad.dev/ubuntu/+source/alsa-utils/1.0.9a-4ubuntu1/+buildjob/11
 
     >>> for notification in view.request.response.notifications:
     ...     print notification.message

=== added file 'lib/lp/soyuz/browser/tests/test_builder.py'
--- lib/lp/soyuz/browser/tests/test_builder.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/browser/tests/test_builder.py	2011-01-14 10:09:39 +0000
@@ -0,0 +1,38 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for the lp.soyuz.browser.builder module."""
+
+__metaclass__ = type
+
+from canonical.launchpad.webapp import canonical_url
+from canonical.testing.layers import DatabaseFunctionalLayer
+from lp.testing import TestCaseWithFactory
+from lp.testing.publication import test_traverse
+
+
+class TestBuildersNavigation(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def test_buildjob_redirects_for_recipe_build(self):
+        # /builders/+buildjob/<job id> redirects to the build page.
+        build = self.factory.makeSourcePackageRecipeBuild()
+        url = 'http://launchpad.dev/builders/+buildjob/%s' % build.url_id
+        context, view, request = test_traverse(url)
+        view()
+        self.assertEqual(301, request.response.getStatus())
+        self.assertEqual(
+            canonical_url(build),
+            request.response.getHeader('location'))
+
+    def test_buildjob_redirects_for_binary_build(self):
+        # /builders/+buildjob/<job id> redirects to the build page.
+        build = self.factory.makeBinaryPackageBuild()
+        url = 'http://launchpad.dev/builders/+buildjob/%s' % build.url_id
+        context, view, request = test_traverse(url)
+        view()
+        self.assertEqual(301, request.response.getStatus())
+        self.assertEqual(
+            canonical_url(build),
+            request.response.getHeader('location'))

=== modified file 'lib/lp/soyuz/doc/binarypackagebuild.txt'
--- lib/lp/soyuz/doc/binarypackagebuild.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/soyuz/doc/binarypackagebuild.txt	2011-01-14 10:09:39 +0000
@@ -85,13 +85,13 @@
     buildlog_ubuntutest-breezy-autotest-i386.mozilla-firefox_0.9_FULLYBUILT.txt.gz
 
     >>> print firefox_build.log_url
-    http://launchpad.dev/ubuntutest/+source/mozilla-firefox/0.9/+build/.../+files/buildlog_ubuntutest-breezy-autotest-i386.mozilla-firefox_0.9_FULLYBUILT.txt.gz
+    http://launchpad.dev/ubuntutest/+source/mozilla-firefox/0.9/+buildjob/.../+files/buildlog_ubuntutest-breezy-autotest-i386.mozilla-firefox_0.9_FULLYBUILT.txt.gz
 
     >>> print firefox_build.upload_changesfile.filename
     firefox_0.9_i386.changes
 
     >>> print firefox_build.changesfile_url
-    http://launchpad.dev/ubuntutest/+source/mozilla-firefox/0.9/+build/.../+files/firefox_0.9_i386.changes
+    http://launchpad.dev/ubuntutest/+source/mozilla-firefox/0.9/+buildjob/.../+files/firefox_0.9_i386.changes
 
 The 'firefox_build' is already finished and requesting the estimated build
 start time makes no sense. Hence an exception is raised.
@@ -202,7 +202,7 @@
     upload_9_log.txt
 
     >>> print active_build.upload_log_url
-    http://launchpad.dev/ubuntu/+source/pmount/0.1-1/+build/9/+files/upload_9_log.txt
+    http://launchpad.dev/ubuntu/+source/pmount/0.1-1/+buildjob/9/+files/upload_9_log.txt
 
 Once the transaction is committed, the file is available in the
 librarian, and we can retrieve its contents.

=== modified file 'lib/lp/soyuz/doc/build-failedtoupload-workflow.txt'
--- lib/lp/soyuz/doc/build-failedtoupload-workflow.txt	2010-12-22 01:08:48 +0000
+++ lib/lp/soyuz/doc/build-failedtoupload-workflow.txt	2011-01-14 10:09:39 +0000
@@ -88,8 +88,8 @@
    * Component: main
    * State: Failed to upload
    * Duration: a minute
-   * Build Log: http://launchpad.dev/ubuntu/+source/cdrkit/1.0/+build/22/+fil=
-  es/netapplet-1.0.0.tar.gz
+   * Build Log: http://launchpad.dev/ubuntu/+source/cdrkit/1.0/+buildjob/22/+=
+  files/netapplet-1.0.0.tar.gz
    * Builder: http://launchpad.dev/builders/bob
    * Source: http://launchpad.dev/ubuntu/+source/cdrkit/1.0
   <BLANKLINE>
@@ -101,7 +101,7 @@
   <BLANKLINE>
   --
   i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE
-  http://launchpad.dev/ubuntu/+source/cdrkit/1.0/+build/22
+  http://launchpad.dev/ubuntu/+source/cdrkit/1.0/+buildjob/22
   <BLANKLINE>
 
 

=== modified file 'lib/lp/soyuz/doc/build-notification.txt'
--- lib/lp/soyuz/doc/build-notification.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/soyuz/doc/build-notification.txt	2011-01-14 10:09:39 +0000
@@ -114,7 +114,7 @@
    * Component: main
    * State: Failed to build
    * Duration: three minutes
-   * Build Log: http://launchpad.dev/ubuntu/+source/pmount/0.1-1/+build/9/+files/netapplet-1.0.0.tar.gz
+   * Build Log: http://launchpad.dev/ubuntu/+source/pmount/0.1-1/+buildjob/9/+files/netapplet-1.0.0.tar.gz
    * Builder: http://launchpad.dev/builders/bob
    * Source: http://launchpad.dev/ubuntu/+source/pmount/0.1-1
   <BLANKLINE>
@@ -125,7 +125,7 @@
   <BLANKLINE>
   --
   i386 build of pmount 0.1-1 in ubuntu warty RELEASE
-  http://launchpad.dev/ubuntu/+source/pmount/0.1-1/+build/9
+  http://launchpad.dev/ubuntu/+source/pmount/0.1-1/+buildjob/9
   <BLANKLINE>
 
 Notification for a pending (NEEDSBUILD) build record:
@@ -193,7 +193,7 @@
   <BLANKLINE>
   --
   i386 build of alsa-utils 1.0.9a-4ubuntu1 in ubuntu hoary RELEASE
-  http://launchpad.dev/ubuntu/+source/alsa-utils/1.0.9a-4ubuntu1/+build/11
+  http://launchpad.dev/ubuntu/+source/alsa-utils/1.0.9a-4ubuntu1/+buildjob/11
   <BLANKLINE>
 
 Notification for a BUILDING build record:
@@ -261,7 +261,7 @@
   <BLANKLINE>
   --
   i386 build of mozilla-firefox 0.9 in ubuntu hoary RELEASE
-  http://launchpad.dev/ubuntu/+source/mozilla-firefox/0.9/+build/8
+  http://launchpad.dev/ubuntu/+source/mozilla-firefox/0.9/+buildjob/8
   <BLANKLINE>
 
 Notification for a SUPERSEDED build record:
@@ -329,7 +329,7 @@
   <BLANKLINE>
   --
   i386 build of at 0.00 in ubuntu warty RELEASE
-  http://launchpad.dev/ubuntu/+source/at/0.00/+build/15
+  http://launchpad.dev/ubuntu/+source/at/0.00/+buildjob/15
   <BLANKLINE>
 
 Check if the 'build_notification' configuration option really suppress
@@ -451,7 +451,7 @@
    * Component: main
    * State: Failed to build
    * Duration: a minute
-   * Build Log: http://launchpad.dev/~cprov/+archive/ppa/+build/26/+files/netapplet-1.0.0.tar.gz
+   * Build Log: http://launchpad.dev/~cprov/+archive/ppa/+buildjob/26/+files/netapplet-1.0.0.tar.gz
    * Builder: http://launchpad.dev/builders/bob
    * Source: not available
   ...
@@ -614,7 +614,7 @@
    * Component: main
    * State: Failed to build
    * Duration: a minute
-   * Build Log: http://launchpad.dev/~cprov/+archive/testing/+build/26/+files/netapplet-1.0.0.tar.gz
+   * Build Log: http://launchpad.dev/~cprov/+archive/testing/+buildjob/26/+files/netapplet-1.0.0.tar.gz
    * Builder: http://launchpad.dev/builders/bob
    * Source: not available
   <BLANKLINE>
@@ -625,5 +625,5 @@
   <BLANKLINE>
   --
   i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE
-  http://launchpad.dev/~cprov/+archive/testing/+build/26
+  http://launchpad.dev/~cprov/+archive/testing/+buildjob/26
   <BLANKLINE>

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-files.txt'
--- lib/lp/soyuz/stories/ppa/xx-ppa-files.txt	2010-12-10 00:08:39 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ppa-files.txt	2011-01-14 10:09:39 +0000
@@ -181,7 +181,7 @@
     >>> no_priv_browser.getControl("Filter").click()
 
     >>> check_urls(no_priv_browser, builds_links,
-    ...            'http://launchpad.dev/~no-priv/+archive/p3a/+build/31')
+    ...            'http://launchpad.dev/~no-priv/+archive/p3a/+buildjob/31')
     buildlog_ubuntu-breezy-autotest-i386.test-pkg_1.0_FULLYBUILT.txt.gz: OK
 
     >>> no_priv_browser.open(
@@ -208,7 +208,7 @@
     i386 build of test-pkg 1.0 : PPA named p3a for No Privileges Person : No Privileges Person
 
     >>> check_urls(no_priv_browser, build_links,
-    ...            'http://launchpad.dev/~no-priv/+archive/p3a/+build/31')
+    ...            'http://launchpad.dev/~no-priv/+archive/p3a/+buildjob/31')
     test-bin_1.0_i386.changes:    OK
     buildlog_...txt.gz:           OK
     upload_..._log.txt:           OK
@@ -276,7 +276,7 @@
     >>> buildlog_content = buildlog.read()
     >>> buildlog_size = str(buildlog.content.filesize)
     >>> buildlog_lp_url = str(
-    ...     'http://launchpad.dev/~no-priv/+archive/p3a/+build/%d/+files/%s' %
+    ...     'http://launchpad.dev/~no-priv/+archive/p3a/+buildjob/%d/+files/%s' %
     ...     (build.id, buildlog.filename))
 
     >>> diff_content = package_diff.diff_content.read()
@@ -380,12 +380,12 @@
     Location: http://localhost/~no-priv/+archive/ppa/+files/test-pkg_1.0.dsc
     ...
 
-The same redirection happens for +archive/+build/blah urls:
+The same redirection happens for +archive/+buildjob/blah urls:
 
     >>> buildlog_lp_url_without_ppa_name = buildlog_lp_url.replace(
     ...     '/p3a', '')
     >>> print buildlog_lp_url_without_ppa_name
-    http://.../~no-priv/+archive/+build/31/+files/...
+    http://.../~no-priv/+archive/+buildjob/31/+files/...
 
     >>> print http(r"""
     ... GET %s HTTP/1.1
@@ -393,7 +393,7 @@
     ...     'http://launchpad.dev', ''))
     HTTP/1.1 301 Moved Permanently
     ...
-    Location: http://.../~no-priv/+archive/ppa/+build/31/+files/...
+    Location: http://.../~no-priv/+archive/ppa/+buildjob/31/+files/...
     ...
 
 

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-binarypackagerelease-index.txt'
--- lib/lp/soyuz/stories/soyuz/xx-binarypackagerelease-index.txt	2010-05-17 15:03:59 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-binarypackagerelease-index.txt	2011-01-14 10:09:39 +0000
@@ -14,7 +14,7 @@
   ...     'i386 build of mozilla-firefox 0.9 in ubuntu '
   ...     'warty RELEASE')
   >>> build_link.url
-  'http://launchpad.dev/ubuntu/+source/mozilla-firefox/0.9/+build/2'
+  'http://launchpad.dev/ubuntu/+source/mozilla-firefox/0.9/+buildjob/2'
 
 Next, we'll manually create a suitable package upload record for our
 build:
@@ -40,7 +40,7 @@
 
   >>> build_link.click()
   >>> browser.url
-  'http://launchpad.dev/ubuntu/+source/mozilla-firefox/0.9/+build/2'
+  'http://launchpad.dev/ubuntu/+source/mozilla-firefox/0.9/+buildjob/2'
 
 This build produced one BinaryPackage, called 'mozilla-firefox 0.9',
 which is presented in the right portlet, called 'Resulting Binaries'.

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
--- lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2010-12-16 12:48:14 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2011-01-14 10:09:39 +0000
@@ -39,7 +39,7 @@
 individual `Build`, and they can be accessed via the build-farm URL
 shortcut.
 
-    >>> build_url = "http://launchpad.dev/builders/+build/%d" % build_id
+    >>> build_url = "http://launchpad.dev/builders/+buildjob/%d" % build_id
 
 Using the short-cut URL any user can promptly access the build
 page. It's title briefly describes the build.
@@ -226,10 +226,10 @@
     http://launchpad.dev/builders/bob
 
     >>> print anon_browser.getLink('buildlog').url
-    http://.../+build/31/+files/fake-buildlog
+    http://.../+buildjob/31/+files/fake-buildlog
 
     >>> print anon_browser.getLink('uploadlog').url
-    http://.../+build/31/+files/fake-uploadlog
+    http://.../+buildjob/31/+files/fake-uploadlog
 
 Note that the links to the logs points to their `ProxiedLibrarianFile`
 entry points, so users with permission can reach the files even if
@@ -249,7 +249,7 @@
     uploadlog (7 bytes)
 
     >>> print admin_browser.getLink('Retry this build').url
-    http://launchpad.dev/ubuntutest/+source/testing/1.0/+build/31/+retry
+    http://launchpad.dev/ubuntutest/+source/testing/1.0/+buildjob/31/+retry
 
 By clicking on the 'Retry this build' link, administrators are informed of
 the consequences of this action.
@@ -337,7 +337,7 @@
     testing_1.0_all.changes (15 bytes)
 
     >>> print anon_browser.getLink('testing_1.0_all.changes').url
-    http://.../+build/31/+files/testing_1.0_all.changes
+    http://.../+buildjob/31/+files/testing_1.0_all.changes
 
     >>> print extract_text(
     ...     find_tag_by_id(anon_browser.contents, 'binaries'))
@@ -364,7 +364,7 @@
 already have access to them.
 
     >>> print anon_browser.getLink('testing-bin_1.0_all.deb').url
-    http://.../+build/31/+files/testing-bin_1.0_all.deb
+    http://.../+buildjob/31/+files/testing-bin_1.0_all.deb
 
 Again, note that the files are `ProxiedLibrarianFile` objects as well.
 
@@ -389,7 +389,7 @@
     LinkNotFoundError
 
     >>> print anon_browser.getLink('testing-bin_1.0_all.deb').url
-    http://.../+build/31/+files/testing-bin_1.0_all.deb
+    http://.../+buildjob/31/+files/testing-bin_1.0_all.deb
 
 When new binaries are accepted by an archive administrator (See
 xx-queue-pages.txt) this condition is presented in the build page.
@@ -413,7 +413,7 @@
     LinkNotFoundError
 
     >>> print anon_browser.getLink('testing-bin_1.0_all.deb').url
-    http://.../+build/31/+files/testing-bin_1.0_all.deb
+    http://.../+buildjob/31/+files/testing-bin_1.0_all.deb
 
 Once the accepted binary upload is processed by the backend, the
 binary reference finally becomes a link to its corresponding page.
@@ -455,7 +455,7 @@
     >>> [ppa_build] = ppa_source.getBuilds()
     >>> ppa_build.builder = bob_builder
     >>> ppa_build_url = (
-    ...     "http://launchpad.dev/builders/+build/%d" % ppa_build.id)
+    ...     "http://launchpad.dev/builders/+buildjob/%d" % ppa_build.id)
     >>> logout()
 
     >>> anon_browser.open(ppa_build_url)
@@ -478,10 +478,10 @@
     http://launchpad.dev/builders/bob
 
     >>> print anon_browser.getLink('buildlog').url
-    http://launchpad.dev/~cprov/+archive/ppa/+build/.../+files/buildlog_...
+    http://launchpad.dev/~cprov/+archive/ppa/+buildjob/.../+files/buildlog_...
 
     >>> print anon_browser.getLink('ppa-test-bin_1.0_i386.changes').url
-    http://.../+build/.../+files/ppa-test-bin_1.0_i386.changes
+    http://.../+buildjob/.../+files/ppa-test-bin_1.0_i386.changes
 
 'Build details', as mentioned above, doesn't link to the PPA source
 packages, since they do not exist.
@@ -543,7 +543,7 @@
     ...
 
     >>> print anon_browser.getLink('~cprov/product/mybranch recipe build').url
-    http://code.launchpad.dev/~cprov/+recipe/myrecipe/+build/1
+    http://launchpad.dev/~cprov/+archive/ppa/+buildjob/...
 
 Finally, the 'Build files' section is identical for PPA builds.
 
@@ -554,7 +554,7 @@
     ppa-test-bin_1.0_all.deb (18 bytes)
 
     >>> print anon_browser.getLink('ppa-test-bin_1.0_all.deb').url
-    http://.../+build/.../+files/ppa-test-bin_1.0_all.deb
+    http://.../+buildjob/.../+files/ppa-test-bin_1.0_all.deb
 
 
 Imported binaries builds
@@ -574,7 +574,7 @@
     None
 
     >>> imported_build_url = (
-    ...     "http://launchpad.dev/builders/+build/%d" % imported_build.id)
+    ...     "http://launchpad.dev/builders/+buildjob/%d" % imported_build.url_id)
 
     >>> logout()
 

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-redirect.txt'
--- lib/lp/soyuz/stories/soyuz/xx-build-redirect.txt	2007-06-12 12:23:15 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-build-redirect.txt	2011-01-14 10:09:39 +0000
@@ -5,6 +5,4 @@
 
     >>> anon_browser.open("http://launchpad.dev/+builds/+build/18")
     >>> anon_browser.url
-    'http://launchpad.dev/ubuntu/+source/mozilla-firefox/0.9/+build/18'
-
-  
+    'http://launchpad.dev/ubuntu/+source/mozilla-firefox/0.9/+buildjob/18'

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt'
--- lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt	2010-09-13 09:45:58 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt	2011-01-14 10:09:39 +0000
@@ -32,7 +32,7 @@
 
     >>> print anon_browser.getLink(
     ...     'i386 build of mozilla-firefox 0.9').url
-    http://launchpad.dev/ubuntu/+source/mozilla-firefox/0.9/+build/8
+    http://launchpad.dev/ubuntu/+source/mozilla-firefox/0.9/+buildjob/8
 
 The build status portlets contain the number of builds waiting
 in queue and the sum of their 'estimated_duration' for each

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt	2010-12-20 06:46:09 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt	2011-01-14 10:09:39 +0000
@@ -188,7 +188,7 @@
     Breezy Badger Autotest: i386
 
     >>> print anon_browser.getLink('i386').url
-    http://launchpad.dev/ubuntutest/+source/testing-dspr/1.0/+build/...
+    http://launchpad.dev/ubuntutest/+source/testing-dspr/1.0/+buildjob/...
 
 The 'Downloads' section lists and links to the files for this
 source. Each file links to its normalized download path based on the

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-private-builds.txt'
--- lib/lp/soyuz/stories/soyuz/xx-private-builds.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-private-builds.txt	2011-01-14 10:09:39 +0000
@@ -109,7 +109,7 @@
 users:
 
     >>> anon_browser.open(
-    ...     "http://launchpad.dev/~cprov/+archive/p3a/+build/%s" %
+    ...     "http://launchpad.dev/~cprov/+archive/p3a/+buildjob/%s" %
     ...     private_build_id)
     Traceback (most recent call last):
     ...
@@ -118,10 +118,10 @@
 But it is fine for authorised users:
 
     >>> cprov_browser.open(
-    ...     "http://launchpad.dev/~cprov/+archive/p3a/+build/%s" %
+    ...     "http://launchpad.dev/~cprov/+archive/p3a/+buildjob/%s" %
     ...     private_build_id)
     >>> print cprov_browser.url
-    http://launchpad.dev/~cprov/+archive/p3a/+build/...
+    http://launchpad.dev/~cprov/+archive/p3a/+buildjob/...
 
 
 == Builder history page ==
@@ -253,7 +253,7 @@
     >>> from zope.security.interfaces import Unauthorized
     >>> try:
     ...     anon_browser.open(
-    ...         "http://launchpad.dev/~cprov/+archive/p3a/+build/%s" %
+    ...         "http://launchpad.dev/~cprov/+archive/p3a/+buildjob/%s" %
     ...         private_build_id)
     ... except Unauthorized:
     ...     print "Got expected exception"
@@ -264,7 +264,7 @@
     >>> browser = setupBrowser(auth="Basic [e-mail]:test")
     >>> try:
     ...     browser.open(
-    ...         "http://launchpad.dev/~cprov/+archive/p3a/+build/%s" %
+    ...         "http://launchpad.dev/~cprov/+archive/p3a/+buildjob/%s" %
     ...         private_build_id)
     ... except Unauthorized:
     ...     print "Got expected exception"
@@ -319,13 +319,13 @@
 Accessing the build page will now also work:
 
     >>> anon_browser.open(
-    ...     "http://launchpad.dev/~cprov/+archive/p3a/+build/%s" %
+    ...     "http://launchpad.dev/~cprov/+archive/p3a/+buildjob/%s" %
     ...     private_build_id)
     >>> print anon_browser.title
     i386 build of privacy-test 666 : PPA named p3a for Celso Providelo : Celso Providelo
 
     >>> browser.open(
-    ...     "http://launchpad.dev/~cprov/+archive/p3a/+build/%s" %
+    ...     "http://launchpad.dev/~cprov/+archive/p3a/+buildjob/%s" %
     ...     private_build_id)
     >>> print browser.title
     i386 build of privacy-test 666 : PPA named p3a for Celso Providelo : Celso Providelo
@@ -342,7 +342,7 @@
     breezy-autotest i386 Successfully built
 
     >>> print browser.getLink('i386').url
-    http://launchpad.dev/~cprov/+archive/p3a/+build/...
+    http://launchpad.dev/~cprov/+archive/p3a/+buildjob/...
 
 Similarly, when accessing the distribution source package release page,
 the main content will display a link to the newly unembargoed build:
@@ -355,4 +355,4 @@
     Breezy Badger Autotest: i386
 
     >>> print browser.getLink('i386').url
-    http://launchpad.dev/~cprov/+archive/p3a/+build/...
+    http://launchpad.dev/~cprov/+archive/p3a/+buildjob/...

=== modified file 'lib/lp/soyuz/stories/webservice/xx-builds.txt'
--- lib/lp/soyuz/stories/webservice/xx-builds.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/soyuz/stories/webservice/xx-builds.txt	2011-01-14 10:09:39 +0000
@@ -51,10 +51,10 @@
     date_first_dispatched: None
     dependencies: None
     distribution_link: u'http://.../beta/ubuntu'
-    log_url: u'http://.../~cprov/+archive/ppa/+build/26/+files/netapplet-1.0.0.tar.gz'
+    log_url: u'http://.../~cprov/+archive/ppa/+buildjob/26/+files/netapplet-1.0.0.tar.gz'
     pocket: u'Release'
     resource_type_link: u'http://api.launchpad.dev/beta/#build'
-    self_link: u'http://api.launchpad.dev/beta/~cprov/+archive/ppa/+build/26'
+    self_link: u'http://api.launchpad.dev/beta/~cprov/+archive/ppa/+buildjob/26'
     status: u'Failed to build'
     title: u'i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE'
     upload_log_url: None
@@ -67,7 +67,7 @@
     >>> pprint_entry(builds_1_0['entries'][0])
     arch_tag: u'i386'
     archive_link: u'http://.../~cprov/+archive/ppa'
-    build_log_url: u'http://.../~cprov/+archive/ppa/+build/26/+files/netapplet-1.0.0.tar.gz'
+    build_log_url: u'http://.../~cprov/+archive/ppa/+buildjob/26/+files/netapplet-1.0.0.tar.gz'
     buildstate: u'Failed to build'
     can_be_rescored: False
     can_be_retried: True
@@ -80,7 +80,7 @@
     distribution_link: u'http://.../ubuntu'
     pocket: u'Release'
     resource_type_link: u'http://.../#build'
-    self_link: u'http://.../~cprov/+archive/ppa/+build/26'
+    self_link: u'http://.../~cprov/+archive/ppa/+buildjob/26'
     title: u'i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE'
     upload_log_url: None
 
@@ -108,10 +108,10 @@
     ...     source_pub['self_link'], 'getBuilds').jsonBody()
 
     >>> print builds['entries'][0]['log_url']
-    http://launchpad.dev/~cprov/+archive/ppa/+build/26/+files/...
+    http://launchpad.dev/~cprov/+archive/ppa/+buildjob/26/+files/...
 
     >>> print builds['entries'][0]['upload_log_url']
-    http://launchpad.dev/~cprov/+archive/ppa/+build/26/+files/...
+    http://launchpad.dev/~cprov/+archive/ppa/+buildjob/26/+files/...
 
 
 Re-trying builds

=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuild.py'
--- lib/lp/soyuz/tests/test_binarypackagebuild.py	2011-01-13 11:42:44 +0000
+++ lib/lp/soyuz/tests/test_binarypackagebuild.py	2011-01-14 10:09:39 +0000
@@ -102,7 +102,7 @@
         self.addFakeBuildLog()
         self.failUnlessEqual(
             'http://launchpad.dev/ubuntutest/+source/'
-            'gedit/666/+build/%d/+files/mybuildlog.txt' % (
+            'gedit/666/+buildjob/%d/+files/mybuildlog.txt' % (
                 self.build.package_build.build_farm_job.id),
             self.build.log_url)
 
@@ -115,7 +115,7 @@
             owner=ppa_owner, name="myppa")
         self.failUnlessEqual(
             'http://launchpad.dev/~joe/'
-            '+archive/myppa/+build/%d/+files/mybuildlog.txt' % (
+            '+archive/myppa/+buildjob/%d/+files/mybuildlog.txt' % (
                 self.build.build_farm_job.id),
             self.build.log_url)
 

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2011-01-06 16:42:50 +0000
+++ lib/lp/testing/factory.py	2011-01-14 10:09:39 +0000
@@ -2312,6 +2312,7 @@
             if naked_sprb.date_started is None:
                 naked_sprb.date_started = spr_build.date_created
             naked_sprb.date_finished = naked_sprb.date_started + duration
+        IStore(spr_build).flush()
         return spr_build
 
     def makeSourcePackageRecipeBuildJob(
@@ -3101,6 +3102,7 @@
             date_created=date_created)
         naked_build = removeSecurityProxy(binary_package_build)
         naked_build.builder = builder
+        IStore(binary_package_build).flush()
         return binary_package_build
 
     def makeSourcePackagePublishingHistory(self, sourcepackagename=None,