Merge lp:~michael.nelson/launchpad/536700-present-packagebuilds-in-ppa-context into lp:launchpad/db-devel

[Michael Nelson]

Please review my branch:

   bzr+ssh://bazaar.launchpad.net/~michael.nelson/launchpad/536700-present-packagebuilds-in-ppa-context

revision 11006.

Test command: bin/test -vv -m test_packagebuild -m test_binarypackagebuild -m
test_hasbuildrecords

This branch does some initial work to enable PPA's to present general
IPackageBuilds rather than IBinaryPackageBuilds (bug 536700).

It adds and tests an IPackageBuildSet.getBuildsForArchive(). It adds an
optional param to the getBuildRecords() method - binary_only - which defaults
to true (current behaivour). It then updates IArchive.getBuildRecords() to
support binary_only=False.

Additionally, it adds an adapter for IBuildFarmJob->IBinaryPackageBuild in
preparation for the UI (so each build can present its title correctly).

[Henning Eggers (henninge)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Michael,
thank you for your fix and sorry for the delay...

Am 14.06.2010 10:35, schrieb Michael Nelson:
> Test command: bin/test -vv -m test_packagebuild -m test_binarypackagebuild -m
> test_hasbuildrecords

Yup, they pass. Thanks.

> This branch does some initial work to enable PPA's to present general
> IPackageBuilds rather than IBinaryPackageBuilds (bug 536700).

So, I assume that is the reason that no bug is attached to this branch?

>
> It adds and tests an IPackageBuildSet.getBuildsForArchive(). It adds an
> optional param to the getBuildRecords() method - binary_only - which defaults
> to true (current behaivour). It then updates IArchive.getBuildRecords() to
> support binary_only=False.
>
> Additionally, it adds an adapter for IBuildFarmJob->IBinaryPackageBuild in
> preparation for the UI (so each build can present its title correctly).
>

Very clever. ;-)

Here are my comments:

> === modified file 'lib/lp/buildmaster/configure.zcml'

OK.

> === modified file 'lib/lp/buildmaster/interfaces/packagebuild.py'

OK.

> === modified file 'lib/lp/buildmaster/model/packagebuild.py'
> --- lib/lp/buildmaster/model/packagebuild.py 2010-06-07 10:43:01 +0000
> +++ lib/lp/buildmaster/model/packagebuild.py 2010-06-14 08:35:42 +0000
> @@ -11,6 +11,7 @@
> from lazr.delegates import delegates
>
> from storm.locals import Int, Reference, Storm, Unicode
> +from storm.expr import Desc
>
> from zope.component import getUtility
> from zope.interface import classProvides, implements
> @@ -19,13 +20,16 @@
> from canonical.launchpad.browser.librarian import (
> ProxiedLibraryFileAlias)
> from canonical.launchpad.interfaces.lpstorm import IMasterStore
> +from canonical.launchpad.webapp.interfaces import (
> + IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
>
> from lp.buildmaster.interfaces.buildbase import BuildStatus
> from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobSource
> from lp.buildmaster.interfaces.packagebuild import (
> - IPackageBuild, IPackageBuildSource)
> + IPackageBuild, IPackageBuildSet, IPackageBuildSource)
> from lp.buildmaster.model.buildbase import handle_status_for_build, BuildBase
> -from lp.buildmaster.model.buildfarmjob import BuildFarmJobDerived
> +from lp.buildmaster.model.buildfarmjob import (
> + BuildFarmJob, BuildFarmJobDerived)
> from lp.registry.interfaces.pocket import PackagePublishingPocket
> from lp.soyuz.adapters.archivedependencies import (
> default_component_dependency_name)
> @@ -214,3 +218,40 @@
> def _handleStatus_GIVENBACK(self, librarian, slave_status, logger):
> return BuildBase._handleStatus_GIVENBACK(
> self, librarian, slave_status, logger)
> +
> +
> +class PackageBuildSet:
> + implements(IPackageBuildSet)
> +
> + def getBuildsForArchive(self, archive, status=None, pocket=None):
> + """See `IPackageBuildSet`."""
> +
> + extra_exprs = []
> +
> + # Add query clause that filters on build status if the latter is
> + # provided.

I had been told that comments are not there to reiterate what the code is
doing - the code should speak for itself. Thi...

review: Needs Fixing (code)

[Michael Nelson (michael.nelson)]

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi Michael,
> thank you for your fix and sorry for the delay...

No problem... it was worth all the improvements below :)

>
> Am 14.06.2010 10:35, schrieb Michael Nelson:
> > Test command: bin/test -vv -m test_packagebuild -m test_binarypackagebuild
> -m
> > test_hasbuildrecords
>
> Yup, they pass. Thanks.
>
> > This branch does some initial work to enable PPA's to present general
> > IPackageBuilds rather than IBinaryPackageBuilds (bug 536700).
>
> So, I assume that is the reason that no bug is attached to this branch?

There are two now :P

>
> >
> > It adds and tests an IPackageBuildSet.getBuildsForArchive(). It adds an
> > optional param to the getBuildRecords() method - binary_only - which
> defaults
> > to true (current behaivour). It then updates IArchive.getBuildRecords() to
> > support binary_only=False.
> >
> > Additionally, it adds an adapter for IBuildFarmJob->IBinaryPackageBuild in
> > preparation for the UI (so each build can present its title correctly).
> >
>
> Very clever. ;-)
>
> Here are my comments:
>
...
> > === modified file 'lib/lp/buildmaster/model/packagebuild.py'
> > --- lib/lp/buildmaster/model/packagebuild.py 2010-06-07 10:43:01 +0000
> > +++ lib/lp/buildmaster/model/packagebuild.py 2010-06-14 08:35:42 +0000
> > @@ -214,3 +218,40 @@
> > def _handleStatus_GIVENBACK(self, librarian, slave_status, logger):
> > return BuildBase._handleStatus_GIVENBACK(
> > self, librarian, slave_status, logger)
> > +
> > +
> > +class PackageBuildSet:
> > + implements(IPackageBuildSet)
> > +
> > + def getBuildsForArchive(self, archive, status=None, pocket=None):
> > + """See `IPackageBuildSet`."""
> > +
> > + extra_exprs = []
> > +
> > + # Add query clause that filters on build status if the latter is
> > + # provided.
>
> I had been told that comments are not there to reiterate what the code is
> doing - the code should speak for itself. This looks like such a case, does it
> not?

/me must stop doing that. Removed.

>
> > + if status is not None:
> > + extra_exprs.append(BuildFarmJob.status == status)
> > +
> > + # Add query clause that filters on pocket if the latter is
> provided.
>
> Same here. The comment is just chatter. Maybe its pseudo code that you forgot
> in here?

Ditto.

>
> > + if pocket:
> > + extra_exprs.append(PackageBuild.pocket == pocket)
> > +
> > + store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
> > + result_set = store.find(PackageBuild,
> > + PackageBuild.archive == archive,
> > + PackageBuild.build_farm_job == BuildFarmJob.id,
> > + *extra_exprs)
> > +
> > + # Ordering according status
> > + # * SUPERSEDED & All by -datecreated
>
> What does "& All" refer to"?

I updated this to: When we have a set of builds that may include pending or superseded builds, we order by -date_created (as we won't always have a date_finished), otherwise we can order by -date_finished.

>
> > + # * FULLYBUILT & FAILURES by -datebuilt
> I would put this near the "else" to expla...

[Henning Eggers (henninge)]

As discussed on mumble:

- Please make sure the indention is less confusing by using an intermediate variable for the states, e.g. "unfinished_states".

+ if status is None or status in [
+ BuildStatus.NEEDSBUILD,
+ BuildStatus.BUILDING,
+ BuildStatus.SUPERSEDED]:
             result_set.order_by(
                 Desc(BuildFarmJob.date_created), BuildFarmJob.id)

- AFAICT PackageBuildSet is missing from __all__ (not TestPackageBuildSet, sorry). Pleaes check that.

Thanks for you good work and patience with me. ;-)

review: Approve (code)

=== removed file 'lib/canonical/buildd/apply-ogre-model'
--- lib/canonical/buildd/apply-ogre-model	2009-06-30 21:06:27 +0000
+++ lib/canonical/buildd/apply-ogre-model	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-#
-# Author: Daniel Silverstone <[e-mail]>
-
-# Buildd Slave tool to apply the ogre model to the chroot
-
-# Expects build id as arg 1, makes build-id to contain the build
-# Expects ogre component name as arg 2
-
-# Needs SUDO to be set to a sudo instance for passwordless access
-# LN must be an ln instance which can take -s and -f at the same time
-
-SUDO=/usr/bin/sudo
-
-BUILDID="$1"
-COMPONENT="$2"
-
-set -e
-
-exec 2>&1
-
-cd $HOME
-cd "build-$BUILDID/chroot-autobuild/etc/apt"
-
-echo "Attempting OGRE for $COMPONENT in build-$BUILDID"
-
-if [ -e "sources.list.$COMPONENT" ]; then
-  if [ -h "sources.list" ]; then
-    $SUDO ln -sf "sources.list.$COMPONENT" sources.list
-  else
-    echo "OGRE sources.list found, but sources.list is not a symlink"
-  fi
-else
-  echo "No OGRE sources.list found."
-fi
-

=== modified file 'lib/canonical/buildd/binarypackage.py'
--- lib/canonical/buildd/binarypackage.py	2010-01-14 02:55:22 +0000
+++ lib/canonical/buildd/binarypackage.py	2010-06-16 14:06:25 +0000
@@ -55,22 +55,12 @@
                 self._dscfile = f
         if self._dscfile is None:
             raise ValueError, files
-        if 'arch_indep' in extra_args:
-            self.arch_indep = extra_args['arch_indep']
-        else:
-            self.arch_indep = False
-        if 'suite' in extra_args:
-            self.suite = extra_args['suite']
-        else:
-            self.suite = False
-        if 'archive_purpose' in extra_args:
-            self.archive_purpose = extra_args['archive_purpose']
-        else:
-            self.archive_purpose = False
-        if 'build_debug_symbols' in extra_args:
-            self.build_debug_symbols = extra_args['build_debug_symbols']
-        else:
-            self.build_debug_symbols = False
+
+        self.archive_purpose = extra_args.get('archive_purpose')
+        self.suite = extra_args.get('suite')
+        self.component = extra_args['ogrecomponent']
+        self.arch_indep = extra_args.get('arch_indep', False)
+        self.build_debug_symbols = extra_args.get('build_debug_symbols', False)
 
         super(BinaryPackageBuildManager, self).initiate(
             files, chroot, extra_args)
@@ -92,7 +82,7 @@
             args.extend(["--purpose=" + self.archive_purpose])
         if self.build_debug_symbols:
             args.extend(["--build-debug-symbols"])
-        args.extend(["--comp=" + self.ogre])
+        args.extend(["--comp=" + self.component])
         args.extend([self._dscfile])
         self.runSubProcess( self._sbuildpath, args )
 

=== modified file 'lib/canonical/buildd/debian.py'
--- lib/canonical/buildd/debian.py	2010-01-14 20:19:27 +0000
+++ lib/canonical/buildd/debian.py	2010-06-16 14:06:25 +0000
@@ -20,7 +20,6 @@
     INIT = "INIT"
     UNPACK = "UNPACK"
     MOUNT = "MOUNT"
-    OGRE = "OGRE"
     SOURCES = "SOURCES"
     UPDATE = "UPDATE"
     REAP = "REAP"
@@ -35,7 +34,6 @@
         BuildManager.__init__(self, slave, buildid)
         self._updatepath = slave._config.get("debianmanager", "updatepath")
         self._scanpath = slave._config.get("debianmanager", "processscanpath")
-        self._ogrepath = slave._config.get("debianmanager", "ogrepath")
         self._sourcespath = slave._config.get("debianmanager", "sourcespath")
         self._cachepath = slave._config.get("slave","filecache")
         self._state = DebianBuildState.INIT
@@ -49,32 +47,15 @@
     def initiate(self, files, chroot, extra_args):
         """Initiate a build with a given set of files and chroot."""
 
-        if 'ogrecomponent' in extra_args:
-            # Ubuntu refers to the concept that "main sees only main
-            # while building" etc as "The Ogre Model" (onions, layers
-            # and all). If we're given an ogre component, use it
-            self.ogre = extra_args['ogrecomponent']
-        else:
-            self.ogre = False
-        if 'archives' in extra_args and extra_args['archives']:
-            self.sources_list = extra_args['archives']
-        else:
-            self.sources_list = None
+        self.sources_list = extra_args.get('archives')
 
         BuildManager.initiate(self, files, chroot, extra_args)
 
-    def doOgreModel(self):
-        """Perform the ogre model activation."""
-        self.runSubProcess(self._ogrepath,
-                           ["apply-ogre-model", self._buildid, self.ogre])
-
     def doSourcesList(self):
         """Override apt/sources.list.
 
         Mainly used for PPA builds.
         """
-        # XXX cprov 2007-05-17: It 'undo' ogre-component changes.
-        # for PPAs it must be re-implemented on builddmaster side.
         args = ["override-sources-list", self._buildid]
         args.extend(self.sources_list)
         self.runSubProcess(self._sourcespath, args)
@@ -181,26 +162,6 @@
             self._state = DebianBuildState.UMOUNT
             self.doUnmounting()
         else:
-            # Run OGRE if we need to, else run UPDATE
-            if self.ogre:
-                self._state = DebianBuildState.OGRE
-                self.doOgreModel()
-            elif self.sources_list is not None:
-                self._state = DebianBuildState.SOURCES
-                self.doSourcesList()
-            else:
-                self._state = DebianBuildState.UPDATE
-                self.doUpdateChroot()
-
-    def iterate_OGRE(self, success):
-        """Just finished running the ogre applicator."""
-        if success != 0:
-            if not self.alreadyfailed:
-                self._slave.chrootFail()
-                self.alreadyfailed = True
-            self._state = DebianBuildState.REAP
-            self.doReapProcesses()
-        else:
             if self.sources_list is not None:
                 self._state = DebianBuildState.SOURCES
                 self.doSourcesList()

=== modified file 'lib/canonical/buildd/debian/changelog'
--- lib/canonical/buildd/debian/changelog	2010-06-10 16:52:04 +0000
+++ lib/canonical/buildd/debian/changelog	2010-06-16 14:06:25 +0000
@@ -1,3 +1,10 @@
+launchpad-buildd (63) hardy-cat; urgency=low
+
+  * Drop apply-ogre-model, since override-sources-list replaced it three years
+    ago. Also clean up extra_args parsing a bit.
+
+ -- William Grant <[e-mail]>  Sat, 12 Jun 2010 11:33:11 +1000
+
 launchpad-buildd (62) hardy-cat; urgency=low
 
   * Make the buildds cope with not having a sourcepackagename LP#587109 

=== modified file 'lib/canonical/buildd/debian/rules'
--- lib/canonical/buildd/debian/rules	2010-03-10 21:23:17 +0000
+++ lib/canonical/buildd/debian/rules	2010-06-16 14:06:25 +0000
@@ -24,8 +24,8 @@
 pyfiles = debian.py slave.py binarypackage.py utils.py __init__.py \
     sourcepackagerecipe.py translationtemplates.py
 slavebins = unpack-chroot mount-chroot update-debian-chroot sbuild-package \
-scan-for-processes umount-chroot remove-build apply-ogre-model \
-override-sources-list buildrecipe generate-translation-templates
+    scan-for-processes umount-chroot remove-build override-sources-list \
+    buildrecipe generate-translation-templates
 
 BUILDDUID=65500
 BUILDDGID=65500

=== modified file 'lib/canonical/buildd/debian/upgrade-config'
--- lib/canonical/buildd/debian/upgrade-config	2010-04-01 03:47:51 +0000
+++ lib/canonical/buildd/debian/upgrade-config	2010-06-16 14:06:25 +0000
@@ -92,6 +92,15 @@
         'generatepath = /usr/share/launchpad-buildd/slavebin/generate-translation-templates\n'
         'resultarchive = translation-templates.tar.gz\n')
 
+def upgrade_to_63():
+    print "Upgrading %s to version 63" % conf_file
+    subprocess.call(["mv", conf_file, conf_file+"-prev63~"])
+    in_file = open(conf_file+"-prev63~", "r")
+    out_file = open(conf_file, "w")
+    for line in in_file:
+        if not line.startswith('ogrepath'):
+            out_file.write(line)
+
 
 if __name__ == "__main__":
     if old_version.find("~") > 0:
@@ -108,4 +117,6 @@
         upgrade_to_58()
     if int(old_version) < 59:
         upgrade_to_59()
+    if int(old_version) < 63:
+        upgrade_to_63()
 

=== modified file 'lib/canonical/buildd/template-buildd-slave.conf'
--- lib/canonical/buildd/template-buildd-slave.conf	2010-03-12 08:32:39 +0000
+++ lib/canonical/buildd/template-buildd-slave.conf	2010-06-16 14:06:25 +0000
@@ -18,7 +18,6 @@
 [debianmanager]
 updatepath = /usr/share/launchpad-buildd/slavebin/update-debian-chroot
 processscanpath = /usr/share/launchpad-buildd/slavebin/scan-for-processes
-ogrepath = /usr/share/launchpad-buildd/slavebin/apply-ogre-model
 sourcespath = /usr/share/launchpad-buildd/slavebin/override-sources-list
 
 [binarypackagemanager]

=== modified file 'lib/canonical/buildd/tests/buildd-slave-test.conf'
--- lib/canonical/buildd/tests/buildd-slave-test.conf	2007-06-05 00:53:06 +0000
+++ lib/canonical/buildd/tests/buildd-slave-test.conf	2010-06-16 14:06:25 +0000
@@ -17,5 +17,4 @@
 sbuildargs = -dautobuild --nolog --batch
 updatepath = /var/tmp/buildd/slavebin/update-debian-chroot
 processscanpath = /var/tmp/buildd/slavebin/scan-for-processes
-ogrepath = /var/tmp/buildd/slavebin/apply-ogre-model
 sourcespath = /usr/share/launchpad-buildd/slavebin/override-sources-list

=== modified file 'lib/canonical/launchpad/templates/launchpad-form.pt'
--- lib/canonical/launchpad/templates/launchpad-form.pt	2010-03-15 16:58:49 +0000
+++ lib/canonical/launchpad/templates/launchpad-form.pt	2010-06-16 14:06:25 +0000
@@ -171,9 +171,12 @@
         </td>
       </tr>
     </tal:is-visible>
-    <tal:not-visible condition="not: widget/visible">
-      <tr>
-        <td tal:content="structure widget/hidden" />
+    <tal:not-visible
+      condition="not: widget/visible">
+      <tr
+        tal:define="markup widget/hidden"
+        tal:condition="markup">
+        <td tal:content="structure markup" />
       </tr>
     </tal:not-visible>
   </metal:macro>

=== modified file 'lib/canonical/widgets/product.py'
--- lib/canonical/widgets/product.py	2009-07-21 03:56:03 +0000
+++ lib/canonical/widgets/product.py	2010-06-16 14:06:25 +0000
@@ -408,7 +408,7 @@
 
 class GhostWidget(TextWidget):
     """A simple widget that has no HTML."""
-
+    visible = False
     # This suppresses the stuff above the widget.
     display_label = False
     # This suppresses the stuff underneath the widget.
@@ -418,3 +418,5 @@
     def __call__(self):
         """See `SimpleInputWidget`."""
         return ''
+
+    hidden = __call__

=== modified file 'lib/lp/buildmaster/configure.zcml'
--- lib/lp/buildmaster/configure.zcml	2010-05-20 13:12:04 +0000
+++ lib/lp/buildmaster/configure.zcml	2010-06-16 14:06:25 +0000
@@ -75,6 +75,12 @@
         <allow
             interface="lp.buildmaster.interfaces.packagebuild.IPackageBuildSource" />
     </securedutility>
+    <securedutility
+        class="lp.buildmaster.model.packagebuild.PackageBuildSet"
+        provides="lp.buildmaster.interfaces.packagebuild.IPackageBuildSet">
+        <allow
+            interface="lp.buildmaster.interfaces.packagebuild.IPackageBuildSet" />
+    </securedutility>
 
     <!-- BuildQueue -->
     <class

=== modified file 'lib/lp/buildmaster/interfaces/packagebuild.py'
--- lib/lp/buildmaster/interfaces/packagebuild.py	2010-05-21 09:42:21 +0000
+++ lib/lp/buildmaster/interfaces/packagebuild.py	2010-06-16 14:06:25 +0000
@@ -6,6 +6,7 @@
 __all__ = [
     'IPackageBuild',
     'IPackageBuildSource',
+    'IPackageBuildSet',
     ]
 
 
@@ -16,6 +17,7 @@
 
 from canonical.launchpad import _
 from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.distroseries import IDistroSeries
@@ -162,10 +164,33 @@
 class IPackageBuildSource(Interface):
     """A utility of this interface used to create _things_."""
 
-    def new(archive, pocket, dependencies=None):
+    def new(job_type, virtualized, archive, pocket, processor=None,
+            status=BuildStatus.NEEDSBUILD, dependencies=None):
         """Create a new `IPackageBuild`.
 
+        :param job_type: A `BuildFarmJobType` item.
+        :param virtualized: A boolean indicating whether this build was
+            virtualized.
         :param archive: An `IArchive`.
         :param pocket: An item of `PackagePublishingPocket`.
+        :param processor: An `IProcessor` required to run this build farm
+            job. Default is None (processor-independent).
+        :param status: A `BuildStatus` item defaulting to NEEDSBUILD.
         :param dependencies: An optional debian-like dependency line.
         """
+
+
+class IPackageBuildSet(Interface):
+    """A utility representing a set of package builds."""
+
+    def getBuildsForArchive(archive, status=None, pocket=None):
+        """Return package build records targeted to a given IArchive.
+
+        :param archive: The archive for which builds will be returned.
+        :param status: If status is provided, only builders with that
+            status will be returned.
+        :param pocket: If pocket is provided only builds for that pocket
+            will be returned.
+        :return: a `ResultSet` representing the requested package builds.
+        """
+

=== modified file 'lib/lp/buildmaster/model/packagebuild.py'
--- lib/lp/buildmaster/model/packagebuild.py	2010-06-07 10:43:01 +0000
+++ lib/lp/buildmaster/model/packagebuild.py	2010-06-16 14:06:25 +0000
@@ -5,12 +5,14 @@
 __all__ = [
     'PackageBuild',
     'PackageBuildDerived',
+    'PackageBuildSet',
     ]
 
 
 from lazr.delegates import delegates
 
 from storm.locals import Int, Reference, Storm, Unicode
+from storm.expr import Desc
 
 from zope.component import getUtility
 from zope.interface import classProvides, implements
@@ -19,13 +21,16 @@
 from canonical.launchpad.browser.librarian import (
     ProxiedLibraryFileAlias)
 from canonical.launchpad.interfaces.lpstorm import IMasterStore
+from canonical.launchpad.webapp.interfaces import (
+        IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobSource
 from lp.buildmaster.interfaces.packagebuild import (
-    IPackageBuild, IPackageBuildSource)
+    IPackageBuild, IPackageBuildSet, IPackageBuildSource)
 from lp.buildmaster.model.buildbase import handle_status_for_build, BuildBase
-from lp.buildmaster.model.buildfarmjob import BuildFarmJobDerived
+from lp.buildmaster.model.buildfarmjob import (
+    BuildFarmJob, BuildFarmJobDerived)
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.adapters.archivedependencies import (
     default_component_dependency_name)
@@ -214,3 +219,41 @@
     def _handleStatus_GIVENBACK(self, librarian, slave_status, logger):
         return BuildBase._handleStatus_GIVENBACK(
             self, librarian, slave_status, logger)
+
+
+class PackageBuildSet:
+    implements(IPackageBuildSet)
+
+    def getBuildsForArchive(self, archive, status=None, pocket=None):
+        """See `IPackageBuildSet`."""
+
+        extra_exprs = []
+
+        if status is not None:
+            extra_exprs.append(BuildFarmJob.status == status)
+
+        if pocket:
+            extra_exprs.append(PackageBuild.pocket == pocket)
+
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        result_set = store.find(PackageBuild,
+            PackageBuild.archive == archive,
+            PackageBuild.build_farm_job == BuildFarmJob.id,
+            *extra_exprs)
+
+        # When we have a set of builds that may include pending or
+        # superseded builds, we order by -date_created (as we won't
+        # always have a date_finished). Otherwise we can order by
+        # -date_finished.
+        unfinished_states = [
+            BuildStatus.NEEDSBUILD,
+            BuildStatus.BUILDING,
+            BuildStatus.SUPERSEDED]
+        if status is None or status in unfinished_states:
+            result_set.order_by(
+                Desc(BuildFarmJob.date_created), BuildFarmJob.id)
+        else:
+            result_set.order_by(
+                Desc(BuildFarmJob.date_finished), BuildFarmJob.id)
+
+        return result_set

=== modified file 'lib/lp/buildmaster/tests/test_packagebuild.py'
--- lib/lp/buildmaster/tests/test_packagebuild.py	2010-05-21 12:48:44 +0000
+++ lib/lp/buildmaster/tests/test_packagebuild.py	2010-06-16 14:06:25 +0000
@@ -15,9 +15,10 @@
 
 from canonical.testing.layers import LaunchpadFunctionalLayer
 
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
 from lp.buildmaster.interfaces.packagebuild import (
-    IPackageBuild, IPackageBuildSource)
+    IPackageBuild, IPackageBuildSet, IPackageBuildSource)
 from lp.buildmaster.model.packagebuild import PackageBuild
 from lp.buildmaster.tests.test_buildbase import TestBuildBaseMixin
 from lp.registry.interfaces.pocket import PackagePublishingPocket
@@ -31,15 +32,16 @@
     only classes deriving from PackageBuild should be used.
     """
 
-    def makePackageBuild(self, archive=None):
+    def makePackageBuild(
+        self, archive=None, job_type=BuildFarmJobType.PACKAGEBUILD,
+        status=BuildStatus.NEEDSBUILD,
+        pocket=PackagePublishingPocket.RELEASE):
         if archive is None:
             archive = self.factory.makeArchive()
 
         return getUtility(IPackageBuildSource).new(
-            job_type=BuildFarmJobType.PACKAGEBUILD,
-            virtualized=True,
-            archive=archive,
-            pocket=PackagePublishingPocket.RELEASE)
+            job_type=job_type, virtualized=True, archive=archive,
+            status=status, pocket=pocket)
 
 
 class TestBuildBaseMethods(TestPackageBuildBase, TestBuildBaseMixin):
@@ -176,5 +178,46 @@
             u'My deps', self.package_build.dependencies)
 
 
+class TestPackageBuildSet(TestPackageBuildBase):
+
+    layer = LaunchpadFunctionalLayer
+
+    def setUp(self):
+        super(TestPackageBuildSet, self).setUp()
+        person = self.factory.makePerson()
+        self.archive = self.factory.makeArchive(owner=person)
+        self.package_builds = []
+        self.package_builds.append(
+            self.makePackageBuild(archive=self.archive,
+                                  pocket=PackagePublishingPocket.UPDATES))
+        self.package_builds.append(
+            self.makePackageBuild(archive=self.archive,
+                                  status=BuildStatus.BUILDING))
+        self.package_build_set = getUtility(IPackageBuildSet)
+
+    def test_getBuildsForArchive_all(self):
+        # The default call without arguments returns all builds for the
+        # archive.
+        self.assertContentEqual(
+            self.package_builds, self.package_build_set.getBuildsForArchive(
+                self.archive))
+
+    def test_getBuildsForArchive_by_status(self):
+        # If the status arg is used, the results will be filtered by
+        # status.
+        self.assertContentEqual(
+            self.package_builds[1:],
+            self.package_build_set.getBuildsForArchive(
+                self.archive, status=BuildStatus.BUILDING))
+
+    def test_getBuildsForArchive_by_pocket(self):
+        # If the pocket arg is used, the results will be filtered by
+        # pocket.
+        self.assertContentEqual(
+            self.package_builds[:1],
+            self.package_build_set.getBuildsForArchive(
+                self.archive, pocket=PackagePublishingPocket.UPDATES))
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2010-06-12 13:39:48 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2010-06-16 14:06:25 +0000
@@ -37,9 +37,11 @@
     LaunchpadView, Link, Navigation, NavigationMenu, stepthrough)
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
+from canonical.launchpad.webapp.sorting import sorted_dotted_numbers
 from canonical.widgets.itemswidgets import LabeledMultiCheckBoxWidget
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.code.errors import ForbiddenInstruction
+from lp.code.interfaces.branch import NoSuchBranch
 from lp.code.interfaces.sourcepackagerecipe import (
     ISourcePackageRecipe, ISourcePackageRecipeSource, MINIMAL_RECIPE_TEXT)
 from lp.code.interfaces.sourcepackagerecipebuild import (
@@ -170,9 +172,12 @@
     ppas = getUtility(IArchiveSet).getPPAsForUser(getUtility(ILaunchBag).user)
     supported_distros = [ppa.distribution for ppa in ppas]
     dsset = getUtility(IDistroSeriesSet).search()
-    terms = [SimpleTerm(distro, distro.id, distro.displayname)
-             for distro in dsset if (
-                 distro.active and distro.distribution in supported_distros)]
+    terms = sorted_dotted_numbers(
+        [SimpleTerm(distro, distro.id, distro.displayname)
+         for distro in dsset if (
+         distro.active and distro.distribution in supported_distros)],
+        key=lambda term: term.value.version)
+    terms.reverse()
     return SimpleVocabulary(terms)
 
 def target_ppas_vocabulary(context):
@@ -375,6 +380,10 @@
                 'recipe_text',
                 'The bzr-builder instruction "run" is not permitted here.')
             return
+        except NoSuchBranch, e:
+            self.setFieldError(
+                'recipe_text', '%s is not a branch on Launchpad.' % e.name)
+            return
 
         self.next_url = canonical_url(source_package_recipe)
 

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-06-14 20:14:15 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-06-16 14:06:25 +0000
@@ -42,7 +42,7 @@
         self.ppa = self.factory.makeArchive(
             displayname='Secret PPA', owner=self.chef, name='ppa')
         self.squirrel = self.factory.makeDistroSeries(
-            displayname='Secret Squirrel', name='secret',
+            displayname='Secret Squirrel', name='secret', version='100.04',
             distribution=self.ppa.distribution)
         self.squirrel.nominatedarchindep = self.squirrel.newArch(
             'i386', ProcessorFamily.get(1), False, self.chef,
@@ -65,6 +65,12 @@
         return extract_text(find_main_content(browser.contents))
 
 
+def get_message_text(browser, index):
+    """Return the text of a message, specified by index."""
+    tags = find_tags_by_class(browser.contents, 'message')[index]
+    return extract_text(tags)
+
+
 class TestSourcePackageRecipeAddView(TestCaseForRecipe):
 
     layer = DatabaseFunctionalLayer
@@ -149,7 +155,7 @@
         browser.getControl('Create Recipe').click()
 
         self.assertEqual(
-            extract_text(find_tags_by_class(browser.contents, 'message')[1]),
+            get_message_text(browser, 1),
             'The bzr-builder instruction "run" is not permitted here.')
 
     def test_create_new_recipe_empty_name(self):
@@ -169,12 +175,29 @@
         browser.getControl('Create Recipe').click()
 
         self.assertEqual(
-            extract_text(find_tags_by_class(browser.contents, 'message')[1]),
-            'Required input is missing.')
+            get_message_text(browser, 1), 'Required input is missing.')
+
+    def createRecipe(self, recipe_text, branch=None):
+        if branch is None:
+            product = self.factory.makeProduct(
+                name='ratatouille', displayname='Ratatouille')
+            branch = self.factory.makeBranch(
+                owner=self.chef, product=product, name='veggies')
+
+        # A new recipe can be created from the branch page.
+        browser = self.getUserBrowser(canonical_url(branch), user=self.chef)
+        browser.getLink('Create packaging recipe').click()
+
+        browser.getControl(name='field.name').value = 'daily'
+        browser.getControl('Description').value = 'Make some food!'
+        browser.getControl('Recipe text').value = recipe_text
+        browser.getControl('Create Recipe').click()
+        return browser
 
     def test_create_recipe_bad_text(self):
         # If a user tries to create source package recipe with bad text, they
         # should get an error.
+<<<<<<< TREE
         branch = self.makeBranch()
 
         # A new recipe can be created from the branch page.
@@ -186,10 +209,14 @@
         browser.getControl('Recipe text').value = 'Foo bar baz'
         browser.getControl('Create Recipe').click()
 
+=======
+        browser = self.createRecipe('Foo bar baz')
+>>>>>>> MERGE-SOURCE
         self.assertEqual(
-            extract_text(find_tags_by_class(browser.contents, 'message')[1]),
+            get_message_text(browser, 1),
             'The recipe text is not a valid bzr-builder recipe.')
 
+<<<<<<< TREE
     def test_create_recipe_no_distroseries(self):
         browser = self.getViewBrowser(self.makeBranch(), '+new-recipe')
         browser.getControl(name='field.name').value = 'daily'
@@ -201,6 +228,28 @@
             extract_text(find_tags_by_class(browser.contents, 'message')[1]),
             'You must specify at least one series for daily builds.')
 
+=======
+    def test_create_recipe_bad_base_branch(self):
+        # If a user tries to create source package recipe with a bad base
+        # branch location, they should get an error.
+        browser = self.createRecipe(MINIMAL_RECIPE_TEXT % 'foo')
+        self.assertEqual(
+            get_message_text(browser, 1), 'foo is not a branch on Launchpad.')
+
+    def test_create_recipe_bad_instruction_branch(self):
+        # If a user tries to create source package recipe with a bad
+        # instruction branch location, they should get an error.
+        product = self.factory.makeProduct(
+            name='ratatouille', displayname='Ratatouille')
+        branch = self.factory.makeBranch(
+            owner=self.chef, product=product, name='veggies')
+        recipe = MINIMAL_RECIPE_TEXT % branch.bzr_identity
+        recipe += 'nest packaging foo debian'
+        browser = self.createRecipe(recipe, branch)
+        self.assertEqual(
+            get_message_text(browser, 1), 'foo is not a branch on Launchpad.')
+
+>>>>>>> MERGE-SOURCE
     def test_create_dupe_recipe(self):
         # You shouldn't be able to create a duplicate recipe owned by the same
         # person with the same name.
@@ -221,7 +270,7 @@
         browser.getControl('Create Recipe').click()
 
         self.assertEqual(
-            extract_text(find_tags_by_class(browser.contents, 'message')[1]),
+            get_message_text(browser, 1),
             'There is already a recipe owned by Master Chef with this name.')
 
 
@@ -516,8 +565,8 @@
             Secret PPA (chef/ppa)
             Distribution series:
             Secret Squirrel
+            Hoary
             Warty
-            Hoary
             or
             Cancel""")
         main_text = self.getMainText(recipe, '+request-builds')

=== modified file 'lib/lp/code/model/sourcepackagerecipedata.py'
--- lib/lp/code/model/sourcepackagerecipedata.py	2010-06-11 04:28:38 +0000
+++ lib/lp/code/model/sourcepackagerecipedata.py	2010-06-16 14:06:25 +0000
@@ -211,6 +211,8 @@
             line_number += 1
             comment = None
             db_branch = branch_map[instruction.recipe_branch.url]
+            if db_branch is None:
+                raise NoSuchBranch(instruction.recipe_branch.url)
             insn = _SourcePackageRecipeDataInstruction(
                 instruction.recipe_branch.name, type, comment,
                 line_number, db_branch, instruction.recipe_branch.revspec,

=== modified file 'lib/lp/registry/doc/product-widgets.txt'
--- lib/lp/registry/doc/product-widgets.txt	2009-08-13 19:36:01 +0000
+++ lib/lp/registry/doc/product-widgets.txt	2010-06-16 14:06:25 +0000
@@ -216,7 +216,6 @@
 
 A custom widget is used to display a link to the license policy.
 
-    >>> from canonical.launchpad.interfaces import License
     >>> from canonical.widgets.product import LicenseWidget
 
     >>> form = {'field.licenses': []}
@@ -414,7 +413,7 @@
     >>> print_checked_items(license_widget(), links=True)
     [ ] Apache License ... <http://www.opensource.org/licenses/apache2.0.php>
     [ ] GNU LGPL v2.1 ... <http://www.opensource.org/licenses/lgpl-2.1.php>
-    [ ] GNU Affero GPL v3 ... <http://www.opensource.org/licenses/agpl-v3.html>
+    [ ] GNU Affero GPL v3 ... <http://www.opensource.org/licenses/agpl-v3...>
     ...
 
 But not all of them.
@@ -425,3 +424,47 @@
     [ ] I don't know yet
     [ ] Other/Proprietary
     [ ] Other/Open Source
+
+
+GhostWidget
+-----------
+
+The GhostWidget is used to suppress the markup of a field in cases where
+another mechanism is used to insert the field's markup into the page. Some
+widget for example generate the markup for subordinate fields, but they
+do not manage the field itself. The LicenseWidget widget for example
+generates the markup for the license_info field; the view must use a
+GhostWidget to suppress the markup.
+
+    >>> from canonical.widgets.product import GhostWidget
+
+    >>> license_info = IProduct['license_info'].bind(firefox)
+    >>> ghost_widget = GhostWidget(license_info, LaunchpadTestRequest())
+    >>> ghost_widget.visible
+    False
+    >>> ghost_widget.hidden()
+    ''
+    >>> ghost_widget()
+    ''
+
+Launchpad form macros do not generate table rows for the GhostWidget.
+
+    >>> from z3c.ptcompat import ViewPageTemplateFile
+    >>> from canonical.config import config
+    >>> from canonical.launchpad.webapp.launchpadform import (
+    ...     custom_widget, LaunchpadFormView)
+
+    >>> class GhostWidgetView(LaunchpadFormView):
+    ...     page_title = 'Test'
+    ...     template = ViewPageTemplateFile(
+    ...         config.root + '/lib/lp/app/templates/generic-edit.pt')
+    ...     schema = IProduct
+    ...     field_names = ['license_info']
+    ...     custom_widget('license_info', GhostWidget)
+
+    >>> request = LaunchpadTestRequest()
+    >>> request.setPrincipal(factory.makePerson())
+    >>> view = GhostWidgetView(firefox, request)
+    >>> view.initialize()
+    >>> extract_text(find_tag_by_id(view.render(), 'launchpad-form-widgets'))
+    u''

=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2010-06-09 08:26:26 +0000
+++ lib/lp/registry/model/sourcepackage.py	2010-06-16 14:06:25 +0000
@@ -508,15 +508,17 @@
         return not self.__eq__(other)
 
     def getBuildRecords(self, build_state=None, name=None, pocket=None,
-                        arch_tag=None, user=None):
+                        arch_tag=None, user=None, binary_only=True):
+        """See `IHasBuildRecords`"""
         # Ignore "user", since it would not make any difference to the
         # records returned here (private builds are only in PPA right
         # now and this method only returns records for SPRs in a
         # distribution).
         # We also ignore the name parameter (required as part of the
-        # IHasBuildRecords interface) and use our own name.
+        # IHasBuildRecords interface) and use our own name and the
+        # binary_only parameter as a source package can only have
+        # binary builds.
 
-        """See `IHasBuildRecords`"""
         clauseTables = ['SourcePackageRelease',
                         'SourcePackagePublishingHistory']
 

=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2010-06-14 15:58:46 +0000
+++ lib/lp/soyuz/configure.zcml	2010-06-16 14:06:25 +0000
@@ -515,6 +515,11 @@
         for="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuild"
         factory="lp.soyuz.browser.build.BuildBreadcrumb"
         permission="zope.Public"/>
+    <adapter
+        provides="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuild"
+        for="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJob"
+        factory="lp.soyuz.model.binarypackagebuild.get_binary_build_for_build_farm_job"
+        permission="zope.Public"/>
 
     <!-- BinaryPackageBuildSet -->
 

=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py	2010-06-15 14:36:47 +0000
+++ lib/lp/soyuz/interfaces/archive.py	2010-06-16 14:06:25 +0000
@@ -29,6 +29,7 @@
     'IArchivePublic',
     'IArchiveSet',
     'IDistributionArchive',
+    'IncompatibleArguments',
     'InsufficientUploadRights',
     'InvalidComponent',
     'InvalidPocketForPartnerArchive',
@@ -89,6 +90,11 @@
     webservice_error(400) #Bad request.
 
 
+class IncompatibleArguments(Exception):
+    """Raised when incompatible arguments are passed to a method."""
+    webservice_error(400) # Bad request.
+
+
 class CannotSwitchPrivacy(Exception):
     """Raised when switching the privacy of an archive that has
     publishing records."""

=== modified file 'lib/lp/soyuz/interfaces/buildrecords.py'
--- lib/lp/soyuz/interfaces/buildrecords.py	2009-07-17 00:26:05 +0000
+++ lib/lp/soyuz/interfaces/buildrecords.py	2010-06-16 14:06:25 +0000
@@ -5,7 +5,7 @@
 
 """IHasBuildRecords interface.
 
-Implemented by any object that can have `IBuild` records related to it.
+Implemented by any object that can have `IPackageBuild` records related to it.
 """
 
 __metaclass__ = type
@@ -45,7 +45,7 @@
     @operation_returns_collection_of(Interface)
     @export_read_operation()
     def getBuildRecords(build_state=None, name=None, pocket=None,
-                        arch_tag=None, user=None):
+                        arch_tag=None, user=None, binary_only=True):
         """Return build records in the context it is implemented.
 
         It excludes build records generated by Gina (imported from a external
@@ -66,9 +66,14 @@
         :param user: optional `IPerson` corresponding to the user performing
             the request. It will filter out build records for which the user
             have no 'view' permission.
+        :param binary_only: optional boolean indicating whether only
+            `BinaryPackageBuild` objects should be returned, or more general
+            `PackageBuild` objects (which may include, for example,
+            `SourcePackageRecipeBuild` objects.
 
-        :return: a result set containing `IBuild` records ordered by descending
-            `IBuild.datebuilt` except when builds are filtered by
-            `BuildStatus.NEEDSBUILD`, in this case records are ordered by
-            descending `BuildQueue.lastscore` (dispatching order).
+        :return: a result set containing `IPackageBuild` records ordered by
+            descending `IPackageBuild.date_finished` except when builds are
+            filtered by `BuildStatus.NEEDSBUILD`, in this case records
+            are ordered by descending `BuildQueue.lastscore`
+            (dispatching order).
         """

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2010-06-14 12:19:10 +0000
+++ lib/lp/soyuz/model/archive.py	2010-06-16 14:06:25 +0000
@@ -34,6 +34,7 @@
     cursor, quote, quote_like, sqlvalues, SQLBase)
 from canonical.launchpad.interfaces.lpstorm import ISlaveStore
 from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.interfaces.packagebuild import IPackageBuildSet
 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
 from lp.buildmaster.model.packagebuild import PackageBuild
 from lp.services.job.interfaces.job import JobStatus
@@ -65,7 +66,7 @@
     ArchiveNotPrivate, ArchivePurpose, ArchiveStatus, CannotCopy,
     CannotSwitchPrivacy, CannotUploadToPPA, CannotUploadToPocket,
     DistroSeriesNotFound, IArchive, IArchiveSet, IDistributionArchive,
-    InsufficientUploadRights, InvalidPocketForPPA,
+    IncompatibleArguments, InsufficientUploadRights, InvalidPocketForPPA,
     InvalidPocketForPartnerArchive, InvalidComponent, IPPA,
     MAIN_ARCHIVE_PURPOSES, NoRightsForArchive, NoRightsForComponent,
     NoSuchPPA, NoTokensForTeams, PocketNotFound, VersionRequiresName,
@@ -369,12 +370,21 @@
         return None
 
     def getBuildRecords(self, build_state=None, name=None, pocket=None,
-                        arch_tag=None, user=None):
+                        arch_tag=None, user=None, binary_only=True):
         """See IHasBuildRecords"""
         # Ignore "user", since anyone already accessing this archive
         # will implicitly have permission to see it.
-        return getUtility(IBinaryPackageBuildSet).getBuildsForArchive(
-            self, build_state, name, pocket, arch_tag)
+
+        if binary_only:
+            return getUtility(IBinaryPackageBuildSet).getBuildsForArchive(
+                self, build_state, name, pocket, arch_tag)
+        else:
+            if arch_tag is not None or name is not None:
+                raise IncompatibleArguments(
+                    "The 'arch_tag' and 'name' parameters can be used only "
+                    "with binary_only=True.")
+            return getUtility(IPackageBuildSet).getBuildsForArchive(
+                self, status=build_state, pocket=pocket)
 
     def getPublishedSources(self, name=None, version=None, status=None,
                             distroseries=None, pocket=None,

=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/binarypackagebuild.py	2010-06-09 12:13:53 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py	2010-06-16 14:06:25 +0000
@@ -65,6 +65,27 @@
     PackageUpload, PackageUploadBuild)
 
 
+def get_binary_build_for_build_farm_job(build_farm_job):
+    """Factory method to returning a binary for a build farm job."""
+    # No need to query the db if the build_farm_job doesn't have
+    # the correct job type.
+    if build_farm_job.job_type != BuildFarmJobType.PACKAGEBUILD:
+        return None
+
+    store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+    find_spec = (BinaryPackageBuild, PackageBuild, BuildFarmJob)
+    resulting_tuple = store.find(
+        find_spec,
+        BinaryPackageBuild.package_build == PackageBuild.id,
+        PackageBuild.build_farm_job == BuildFarmJob.id,
+        BuildFarmJob.id == build_farm_job.id).one()
+
+    if resulting_tuple is None:
+        return None
+
+    return resulting_tuple[0]
+
+
 class BinaryPackageBuild(PackageBuildDerived, SQLBase):
     implements(IBinaryPackageBuild)
     _table = 'BinaryPackageBuild'

=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py	2010-06-14 15:58:46 +0000
+++ lib/lp/soyuz/tests/test_archive.py	2010-06-16 14:06:25 +0000
@@ -240,7 +240,7 @@
         ubuntu_test = breezy_autotest.distribution
         self.series = [breezy_autotest]
         self.series.append(self.factory.makeDistroRelease(
-            distribution=ubuntu_test, name="foo-series"))
+            distribution=ubuntu_test, name="foo-series", version='1.0'))
 
         self.sources = []
         gedit_src_hist = self.publisher.getPubSource(

=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuild.py'
--- lib/lp/soyuz/tests/test_binarypackagebuild.py	2010-06-09 12:07:58 +0000
+++ lib/lp/soyuz/tests/test_binarypackagebuild.py	2010-06-16 14:06:25 +0000
@@ -15,6 +15,7 @@
 from canonical.testing import LaunchpadZopelessLayer
 from lp.services.job.model.job import Job
 from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
 from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.buildmaster.interfaces.buildqueue import IBuildQueue
 from lp.buildmaster.interfaces.packagebuild import IPackageBuild
@@ -120,6 +121,42 @@
                 self.build.build_farm_job.id),
             self.build.log_url)
 
+    def test_adapt_from_build_farm_job(self):
+        # An `IBuildFarmJob` can be adapted to an IBinaryPackageBuild
+        # if it has the correct job type.
+        build_farm_job = self.build.build_farm_job
+        store = Store.of(build_farm_job)
+        store.flush()
+
+        binary_package_build = IBinaryPackageBuild(build_farm_job)
+        self.failUnlessEqual(self.build, binary_package_build)
+
+    def test_adapt_from_build_farm_job_wrong_type(self):
+        # An `IBuildFarmJob` of the wrong type results is None.
+        build_farm_job = self.build.build_farm_job
+        removeSecurityProxy(build_farm_job).job_type = (
+            BuildFarmJobType.RECIPEBRANCHBUILD)
+
+        binary_package_build = IBinaryPackageBuild(build_farm_job)
+        self.failUnlessEqual(None, binary_package_build)
+
+    def test_adapt_from_build_farm_job_prefetching(self):
+        # The package_build is prefetched for efficiency.
+        build_farm_job = self.build.build_farm_job
+
+        # We clear the cache to avoid getting cached objects where
+        # they would normally be queries.
+        store = Store.of(build_farm_job)
+        store.flush()
+        store.reset()
+
+        binary_package_build = IBinaryPackageBuild(build_farm_job)
+
+        self.assertStatementCount(
+            0, getattr, binary_package_build, "package_build")
+        self.assertStatementCount(
+            0, getattr, binary_package_build, "build_farm_job")
+
 
 class TestBuildUpdateDependencies(TestCaseWithFactory):
 

=== modified file 'lib/lp/soyuz/tests/test_hasbuildrecords.py'
--- lib/lp/soyuz/tests/test_hasbuildrecords.py	2010-05-06 10:35:17 +0000
+++ lib/lp/soyuz/tests/test_hasbuildrecords.py	2010-06-16 14:06:25 +0000
@@ -12,6 +12,11 @@
 
 from lp.registry.model.sourcepackage import SourcePackage
 from lp.buildmaster.interfaces.builder import IBuilderSet
+from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
+from lp.buildmaster.interfaces.packagebuild import (
+    IPackageBuildSource)
+from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.soyuz.interfaces.archive import IncompatibleArguments
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.model.processor import ProcessorFamilySet
 from lp.soyuz.tests.test_binarypackagebuild import (
@@ -81,6 +86,32 @@
 
         self.context = self.publisher.distroseries.main_archive
 
+    def test_binary_only_false(self):
+        # An archive can optionally return the more general
+        # package build objects.
+
+        # Until we have different IBuildFarmJob types implemented, we
+        # can only test this by creating a lone PackageBuild of a
+        # different type.
+        getUtility(IPackageBuildSource).new(
+            job_type=BuildFarmJobType.RECIPEBRANCHBUILD, virtualized=True,
+            archive=self.context, pocket=PackagePublishingPocket.RELEASE)
+
+        builds = self.context.getBuildRecords(binary_only=True)
+        self.failUnlessEqual(3, builds.count())
+
+        builds = self.context.getBuildRecords(binary_only=False)
+        self.failUnlessEqual(4, builds.count())
+
+    def test_incompatible_arguments(self):
+        # binary_only=False is incompatible with arch_tag and name.
+        self.failUnlessRaises(
+            IncompatibleArguments, self.context.getBuildRecords,
+            binary_only=False, arch_tag="anything")
+        self.failUnlessRaises(
+            IncompatibleArguments, self.context.getBuildRecords,
+            binary_only=False, name="anything")
+
 
 class TestBuilderHasBuildRecords(TestHasBuildRecordsInterface):
     """Test the Builder implementation of IHasBuildRecords."""

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-06-13 05:56:31 +0000
+++ lib/lp/testing/factory.py	2010-06-16 14:06:25 +0000
@@ -22,8 +22,10 @@
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from itertools import count
+import os.path
+from random import randint
 from StringIO import StringIO
-import os.path
+from threading import local
 
 import pytz
 
@@ -56,7 +58,6 @@
 from canonical.launchpad.webapp.dbpolicy import MasterDatabasePolicy
 from canonical.launchpad.webapp.interfaces import (
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
-from canonical.uuid import generate_uuid
 
 from lp.blueprints.interfaces.specification import (
     ISpecificationSet, SpecificationDefinitionStatus)
@@ -213,14 +214,22 @@
 
     def __init__(self):
         # Initialise the unique identifier.
-        self._integer = count(1)
+        self._local = local()
 
     def getUniqueEmailAddress(self):
         return "[e-mail]" % self.getUniqueString('email')
 
     def getUniqueInteger(self):
-        """Return an integer unique to this factory instance."""
-        return self._integer.next()
+        """Return an integer unique to this factory instance.
+
+        For each thread, this will be a series of increasing numbers, but the
+        starting point will be unique per thread.
+        """
+        counter = getattr(self._local, 'integer', None)
+        if counter is None:
+            counter = count(randint(0, 1000000))
+            self._local.integer = counter
+        return counter.next()
 
     def getUniqueHexString(self, digits=None):
         """Return a unique hexadecimal string.
@@ -245,7 +254,7 @@
         """
         if prefix is None:
             prefix = "generic-string"
-        string = "%s%s" % (prefix, generate_uuid())
+        string = "%s%s" % (prefix, self.getUniqueInteger())
         return string.replace('_', '-').lower()
 
     def getUniqueUnicode(self):