Merge lp:~michael.nelson/launchpad/567922-binarypackagebuild-new-table-3 into lp:launchpad/db-devel

[Michael Nelson]

This branch is part of a pipeline for

https://blueprints.edge.launchpad.net/soyuz/+spec/build-generalisation
https://dev.launchpad.net/LEP/GeneralBuildHistories

**Note**: If it's possible, please ignore the conflicts with db-devel - it's due to a reversion of some work that was in db-devel and that I'd already pushed through the pipeline, and I'm waiting for that work to land again on db-devel before re-merging and pumping.

The actual diff of this branch from the previous is:
http://pastebin.ubuntu.com/428892/

Overview
========
This branch continues the work to switch our BinaryPackageBuild class to the new binarypackagebuild table (using the delegated PackageBuild/BuildFarmJob).

Details
=======
This branch just gets 6 unit test modules passing again, by updating queries and attribute names as appropriate.

In some tests I've had to use removeSecurityProxy (where it wasn't used before). It is while setting attributes that should not be writable, but I'm not sure why they were writable before switching the models... if I've missed something obvious, please let me know!

This branch is dependent on the pending schema patch in a previous branch.

To test
=======

First update the test db schema (required as the db patch still needs to be updated to remove the old build table):
psql launchpad_ftest_template -f database/schema/pending/michaeln-build-generalisation.sql
bin/py database/schema/security.py -d launchpad_ftest_template

And then:
bin/test -vv -m soyuz.tests -t test_publishing -t test_binarypackagebuild -t test_archive -t test_hasbuildrecords -t test_buildpackagejob

The next branch will continue getting the soyuz unit-tests passing with the new model.

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-04-26 15:02:03 +0000
+++ lib/canonical/launchpad/security.py	2010-05-06 11:12:37 +0000
@@ -1476,8 +1476,9 @@
         # strict_component is True because the source package already exists,
         # otherwise, how can they give it back?
         check_perms = check_upload_to_archive(
-            user.person, self.obj.distroseries,
-            self.obj.sourcepackagerelease.sourcepackagename, self.obj.archive,
+            user.person, self.obj.distro_series,
+            self.obj.source_package_release.sourcepackagename,
+            self.obj.archive,
             self.obj.current_component, self.obj.pocket,
             strict_component=True)
         return check_perms == None

=== modified file 'lib/lp/buildmaster/model/buildbase.py'
--- lib/lp/buildmaster/model/buildbase.py	2010-05-06 11:12:34 +0000
+++ lib/lp/buildmaster/model/buildbase.py	2010-05-06 11:12:37 +0000
@@ -23,9 +23,13 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.config import config
+<<<<<<< TREE
 from canonical.database.constants import UTC_NOW
 from canonical.database.sqlbase import (
     clear_current_connection_cache, cursor, flush_database_updates)
+=======
+from canonical.database.sqlbase import ZopelessTransactionManager
+>>>>>>> MERGE-SOURCE
 from canonical.launchpad.helpers import filenameToContentType
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from canonical.librarian.utils import copy_and_close
@@ -46,7 +50,8 @@
     the properties defined on IBuildBase on the inheriting class tables.
     BuildBase cannot therefore implement IBuildBase itself, as storm requires
     that the corresponding __storm_table__ be defined for the class. Instead,
-    the classes using the BuildBase mixin must ensure that they implement IBuildBase.
+    the classes using the BuildBase mixin must ensure that they implement
+    IBuildBase.
     """
     policy_name = 'buildd'
 
@@ -138,8 +143,9 @@
                             % (status, self.buildqueue_record.builder.url))
 =======
             if build.buildqueue_record is not None:
-                logger.critical("Unknown BuildStatus '%s' for builder '%s'"
-                                % (status, build.buildqueue_record.builder.url))
+                logger.critical(
+                    "Unknown BuildStatus '%s' for builder '%s'" % (
+                        status, build.buildqueue_record.builder.url))
             else:
                 logger.critical("Unknown BuildStatus '%s' for %r"
                                 % (status, build))
@@ -450,16 +456,18 @@
     @staticmethod
     def storeBuildInfo(build, librarian, slave_status):
         """See `IBuildBase`."""
-        build.buildlog = build.getLogFromSlave(build)
-        build.builder = build.buildqueue_record.builder
+        # XXX michaeln 2010-05-05 bug=567922
+        # As this method is temporarily static until BuildBase is
+        # removed and the implementation moved to PackageBuild,
+        # self.attr_name is temporarily build.attr_name, which
+        # means we cannot set the build attributes.
+        naked_build = removeSecurityProxy(build)
+        naked_build.log = build.getLogFromSlave(build)
+        naked_build.builder = build.buildqueue_record.builder
         # XXX cprov 20060615 bug=120584: Currently buildduration includes
         # the scanner latency, it should really be asking the slave for
         # the duration spent building locally.
-        build.datebuilt = UTC_NOW
-        # We need dynamic datetime.now() instance to be able to perform
-        # the time operations for duration.
-        RIGHT_NOW = datetime.datetime.now(pytz.timezone('UTC'))
-        build.buildduration = RIGHT_NOW - build.buildqueue_record.date_started
+        naked_build.date_finished = datetime.datetime.now(pytz.UTC)
         if slave_status.get('dependencies') is not None:
             build.dependencies = unicode(slave_status.get('dependencies'))
         else:

=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
--- lib/lp/buildmaster/model/buildfarmjob.py	2010-05-06 11:12:34 +0000
+++ lib/lp/buildmaster/model/buildfarmjob.py	2010-05-06 11:12:37 +0000
@@ -90,7 +90,7 @@
 
     def cleanUp(self):
         """See `IBuildFarmJob`."""
-        Store.of(self).remove(self)
+        pass
 
     def generateSlaveBuildCookie(self):
         """See `IBuildFarmJobOld`."""
@@ -148,6 +148,14 @@
 
         return hashlib.sha1(contents).hexdigest()
 
+    def cleanUp(self):
+        """See `IBuildFarmJob`.
+
+        Classes that derive from BuildFarmJobOld need to clean up
+        after themselves correctly.
+        """
+        Store.of(self).remove(self)
+
 
 class BuildFarmJob(BuildFarmJobOld, Storm):
     """A base implementation for `IBuildFarmJob` classes."""

=== modified file 'lib/lp/buildmaster/model/packagebuild.py'
--- lib/lp/buildmaster/model/packagebuild.py	2010-05-06 11:12:34 +0000
+++ lib/lp/buildmaster/model/packagebuild.py	2010-05-06 11:12:37 +0000
@@ -161,6 +161,10 @@
         """See `IPackageBuild`."""
         raise NotImplementedError
 
+    def queueBuild(self, suspended=False):
+        """See `IPackageBuild`."""
+        raise NotImplementedError
+
 
 class PackageBuildDerived:
     """Setup the delegation for package build.

=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2010-04-14 18:31:51 +0000
+++ lib/lp/registry/model/sourcepackage.py	2010-05-06 11:12:37 +0000
@@ -518,16 +518,17 @@
                         'SourcePackagePublishingHistory']
 
         condition_clauses = ["""
-        Build.sourcepackagerelease = SourcePackageRelease.id AND
+        BinaryPackageBuild.source_package_release =
+            SourcePackageRelease.id AND
         SourcePackageRelease.sourcepackagename = %s AND
         SourcePackagePublishingHistory.distroseries = %s AND
         SourcePackagePublishingHistory.archive IN %s AND
         SourcePackagePublishingHistory.sourcepackagerelease =
             SourcePackageRelease.id AND
-        SourcePackagePublishingHistory.archive = Build.archive
+        SourcePackagePublishingHistory.archive = PackageBuild.archive
         """ % sqlvalues(self.sourcepackagename,
                         self.distroseries,
-                        self.distribution.all_distro_archive_ids)]
+                        list(self.distribution.all_distro_archive_ids))]
 
         # We re-use the optional-parameter handling provided by BuildSet
         # here, but pass None for the name argument as we've already
@@ -539,7 +540,8 @@
         # exclude gina-generated and security (dak-made) builds
         # buildstate == FULLYBUILT && datebuilt == null
         condition_clauses.append(
-            "NOT (Build.buildstate=%s AND Build.datebuilt is NULL)"
+            "NOT (BuildFarmJob.status=%s AND "
+            "     BuildFarmJob.date_finished is NULL)"
             % sqlvalues(BuildStatus.FULLYBUILT))
 
         # Ordering according status
@@ -550,13 +552,14 @@
         if build_state in [BuildStatus.NEEDSBUILD, BuildStatus.BUILDING]:
             orderBy = ["-BuildQueue.lastscore"]
             clauseTables.append('BuildPackageJob')
-            condition_clauses.append('BuildPackageJob.build = Build.id')
+            condition_clauses.append(
+                'BuildPackageJob.build = BinaryPackageBuild.id')
             clauseTables.append('BuildQueue')
             condition_clauses.append('BuildQueue.job = BuildPackageJob.job')
         elif build_state == BuildStatus.SUPERSEDED or build_state is None:
-            orderBy = ["-Build.datecreated"]
+            orderBy = ["-BuildFarmJob.date_created"]
         else:
-            orderBy = ["-Build.datebuilt"]
+            orderBy = ["-BuildFarmJob.date_finished"]
 
         # Fallback to ordering by -id as a tie-breaker.
         orderBy.append("-id")

=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2010-05-06 11:12:34 +0000
+++ lib/lp/soyuz/configure.zcml	2010-05-06 11:12:37 +0000
@@ -507,8 +507,8 @@
 
         <require
             permission="launchpad.Edit"
-            set_attributes="buildlog datebuilt buildduration builder
-                            buildstate dependencies upload_log"/>
+            set_attributes="log date_finished date_started builder
+                            status dependencies upload_log"/>
     </class>
     <adapter
         provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2010-05-03 07:32:58 +0000
+++ lib/lp/soyuz/model/archive.py	2010-05-06 11:12:37 +0000
@@ -33,6 +33,8 @@
 from canonical.database.sqlbase import (
     cursor, quote, quote_like, sqlvalues, SQLBase)
 from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.model.buildfarmjob import BuildFarmJob
+from lp.buildmaster.model.packagebuild import PackageBuild
 from lp.services.job.interfaces.job import JobStatus
 from lp.soyuz.adapters.packagelocation import PackageLocation
 from canonical.launchpad.components.tokens import (
@@ -1146,7 +1148,7 @@
             BinaryPackageRelease.binarypackagename == name,
             BinaryPackageRelease.version == version,
             BinaryPackageBuild.id == BinaryPackageRelease.buildID,
-            DistroArchSeries.id == BinaryPackageBuild.distroarchseriesID,
+            DistroArchSeries.id == BinaryPackageBuild.distro_arch_series_id,
             DistroArchSeries.architecturetag == archtag,
             BinaryPackagePublishingHistory.archive == self,
             BinaryPackagePublishingHistory.binarypackagereleaseID ==
@@ -1343,13 +1345,17 @@
 
         extra_exprs = []
         if build_status is not None:
-            extra_exprs.append(BinaryPackageBuild.buildstate == build_status)
+            extra_exprs = [
+                PackageBuild.build_farm_job == BuildFarmJob.id,
+                BuildFarmJob.status == build_status,
+                ]
 
         result_set = store.find(
             SourcePackageRelease,
-            (BinaryPackageBuild.sourcepackagereleaseID ==
+            (BinaryPackageBuild.source_package_release_id ==
                 SourcePackageRelease.id),
-            BinaryPackageBuild.archive == self,
+            BinaryPackageBuild.package_build == PackageBuild.id,
+            PackageBuild.archive == self,
             *extra_exprs)
 
         result_set.config(distinct=True).order_by(SourcePackageRelease.id)
@@ -1389,15 +1395,18 @@
 
         query = """
             UPDATE Job SET status = %s
-            FROM Build, BuildPackageJob, BuildQueue
+            FROM BinaryPackageBuild, PackageBuild, BuildFarmJob,
+                 BuildPackageJob, BuildQueue
             WHERE
+                BinaryPackageBuild.package_build = PackageBuild.id
                 -- insert self.id here
-                Build.archive = %s
-                AND BuildPackageJob.build = Build.id
+                AND PackageBuild.archive = %s
+                AND BuildPackageJob.build = BinaryPackageBuild.id
                 AND BuildPackageJob.job = BuildQueue.job
                 AND Job.id = BuildQueue.job
                 -- Build is in state BuildStatus.NEEDSBUILD (0)
-                AND Build.buildstate = %s;
+                AND PackageBuild.build_farm_job = BuildFarmJob.id
+                AND BuildFarmJob.status = %s;
         """ % sqlvalues(status, self, BuildStatus.NEEDSBUILD)
 
         store = Store.of(self)

=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/binarypackagebuild.py	2010-05-06 11:12:34 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py	2010-05-06 11:12:37 +0000
@@ -11,8 +11,6 @@
 import logging
 import operator
 
-from lazr.delegates import delegates
-
 from storm.locals import Int, Reference
 
 from zope.interface import implements
@@ -21,8 +19,7 @@
 from storm.expr import (
     Desc, In, Join, LeftJoin)
 from storm.store import Store
-from sqlobject import (
-    ForeignKey, SQLObjectNotFound)
+from sqlobject import SQLObjectNotFound
 from sqlobject.sqlbuilder import AND, IN
 
 from canonical.config import config
@@ -76,10 +73,13 @@
     package_build_id = Int(name='package_build', allow_none=False)
     package_build = Reference(package_build_id, 'PackageBuild.id')
 
-    distro_arch_series = ForeignKey(dbName='distro_arch_series',
-        foreignKey='DistroArchSeries', notNull=True)
-    source_package_release = ForeignKey(dbName='source_package_release',
-        foreignKey='SourcePackageRelease', notNull=True)
+    distro_arch_series_id = Int(name='distro_arch_series', allow_none=False)
+    distro_arch_series = Reference(
+        distro_arch_series_id, 'DistroArchSeries.id')
+    source_package_release_id = Int(
+        name='source_package_release', allow_none=False)
+    source_package_release = Reference(
+        source_package_release_id, 'SourcePackageRelease.id')
 
     @property
     def buildqueue_record(self):
@@ -442,7 +442,7 @@
         # in a PPA or copy archive).
         archives = [self.archive.id]
         if self.archive.purpose != ArchivePurpose.PRIMARY:
-            archives.append(self.distroarchseries.main_archive.id)
+            archives.append(self.distro_arch_series.main_archive.id)
 
         # Look for all sourcepackagerelease instances that match the name
         # and get the (successfully built) build records for this
@@ -852,12 +852,17 @@
 
         # format clause according single/multiple architecture(s) form
         if len(arch_ids) == 1:
-            condition_clauses = [('distroarchseries=%s'
+            condition_clauses = [('distro_arch_series=%s'
                                   % sqlvalues(arch_ids[0]))]
         else:
-            condition_clauses = [('distroarchseries IN %s'
+            condition_clauses = [('distro_arch_series IN %s'
                                   % sqlvalues(arch_ids))]
 
+        condition_clauses.extend([
+            "BinaryPackageBuild.package_build = PackageBuild.id",
+            "PackageBuild.build_farm_job = BuildFarmJob.id"
+            ])
+
         # XXX cprov 2006-09-25: It would be nice if we could encapsulate
         # the chunk of code below (which deals with the optional paramenters)
         # and share it with ISourcePackage.getBuildRecords()
@@ -865,10 +870,11 @@
         # exclude gina-generated and security (dak-made) builds
         # buildstate == FULLYBUILT && datebuilt == null
         if status == BuildStatus.FULLYBUILT:
-            condition_clauses.append("Build.datebuilt IS NOT NULL")
+            condition_clauses.append("BuildFarmJob.date_finished IS NOT NULL")
         else:
             condition_clauses.append(
-                "(Build.buildstate <> %s OR Build.datebuilt IS NOT NULL)"
+                "(BuildFarmJob.status <> %s OR "
+                " BuildFarmJob.date_finished IS NOT NULL)"
                 % sqlvalues(BuildStatus.FULLYBUILT))
 
         # Ordering according status
@@ -880,12 +886,13 @@
             orderBy = ["-BuildQueue.lastscore", "Build.id"]
             clauseTables.append('BuildQueue')
             clauseTables.append('BuildPackageJob')
-            condition_clauses.append('BuildPackageJob.build = Build.id')
+            condition_clauses.append(
+                'BuildPackageJob.build = BinaryPackageBuild.id')
             condition_clauses.append('BuildPackageJob.job = BuildQueue.job')
         elif status == BuildStatus.SUPERSEDED or status is None:
-            orderBy = ["-Build.datecreated"]
+            orderBy = ["-BuildFarmJob.date_created"]
         else:
-            orderBy = ["-Build.datebuilt"]
+            orderBy = ["-BuildFarmJob.date_finished"]
 
         # End of duplication (see XXX cprov 2006-09-25 above).
 
@@ -897,7 +904,7 @@
         clauseTables.append("Archive")
         condition_clauses.append("""
             Archive.purpose IN (%s) AND
-            Archive.id = Build.archive
+            Archive.id = PackageBuild.archive
             """ % ','.join(
                 sqlvalues(ArchivePurpose.PRIMARY, ArchivePurpose.PARTNER)))
 
@@ -1042,7 +1049,7 @@
             LeftJoin(
                 SourcePackageRelease,
                 (SourcePackageRelease.id ==
-                    BinaryPackageBuild.source_package_releaseID)),
+                    BinaryPackageBuild.source_package_release_id)),
             LeftJoin(
                 SourcePackageName,
                 SourcePackageName.id

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2010-05-06 11:12:34 +0000
+++ lib/lp/soyuz/model/publishing.py	2010-05-06 11:12:37 +0000
@@ -41,6 +41,8 @@
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 from canonical.launchpad.webapp.interfaces import NotFoundError
 from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.model.buildfarmjob import BuildFarmJob
+from lp.buildmaster.model.packagebuild import PackageBuild
 from lp.registry.interfaces.person import validate_public_person
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.worlddata.model.country import Country
@@ -1182,19 +1184,22 @@
         # If an optional list of build states was passed in as a parameter,
         # ensure that the result is limited to builds in those states.
         if build_states is not None:
-            extra_exprs.append(
-                BinaryPackageBuild.buildstate.is_in(build_states))
+            extra_exprs.extend((
+                BinaryPackageBuild.package_build == PackageBuild.id,
+                PackageBuild.build_farm_job == BuildFarmJob.id,
+                BuildFarmJob.status.is_in(build_states)))
 
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
 
         # We'll be looking for builds in the same distroseries as the
         # SPPH for the same release.
         builds_for_distroseries_expr = (
-            BinaryPackageBuild.distroarchseriesID == DistroArchSeries.id,
+            BinaryPackageBuild.package_build == PackageBuild.id,
+            BinaryPackageBuild.distro_arch_series_id == DistroArchSeries.id,
             SourcePackagePublishingHistory.distroseriesID ==
                 DistroArchSeries.distroseriesID,
             SourcePackagePublishingHistory.sourcepackagereleaseID ==
-                BinaryPackageBuild.sourcepackagereleaseID,
+                BinaryPackageBuild.source_package_release_id,
             In(SourcePackagePublishingHistory.id, source_publication_ids)
             )
 
@@ -1204,7 +1209,7 @@
             BinaryPackageBuild,
             builds_for_distroseries_expr,
             (SourcePackagePublishingHistory.archiveID ==
-                BinaryPackageBuild.archiveID),
+                PackageBuild.archive_id),
             *extra_exprs)
 
         # Next get all the builds that have a binary published in the
@@ -1214,7 +1219,7 @@
             BinaryPackageBuild,
             builds_for_distroseries_expr,
             (SourcePackagePublishingHistory.archiveID !=
-                BinaryPackageBuild.archiveID),
+                PackageBuild.archive_id),
             BinaryPackagePublishingHistory.archive ==
                 SourcePackagePublishingHistory.archiveID,
             BinaryPackagePublishingHistory.binarypackagerelease ==
@@ -1297,7 +1302,7 @@
 
         join = [
             SourcePackagePublishingHistory.sourcepackagereleaseID ==
-                BinaryPackageBuild.sourcepackagereleaseID,
+                BinaryPackageBuild.source_package_release_id,
             BinaryPackageRelease.build == BinaryPackageBuild.id,
             BinaryPackageRelease.binarypackagenameID ==
                 BinaryPackageName.id,
@@ -1352,7 +1357,9 @@
             self._getSourceBinaryJoinForSources(
                 source_publication_ids, active_binaries_only=False),
             BinaryPackagePublishingHistory.datepublished != None,
-            BinaryPackageBuild.buildstate.is_in(build_states))
+            BinaryPackageBuild.package_build == PackageBuild.id,
+            PackageBuild.build_farm_job == BuildFarmJob.id,
+            BuildFarmJob.status.is_in(build_states))
 
         published_builds.order_by(
             SourcePackagePublishingHistory.id,
@@ -1385,7 +1392,7 @@
                 BinaryPackageRelease.id,
             BinaryPackageRelease.buildID == BinaryPackageBuild.id,
             SourcePackagePublishingHistory.sourcepackagereleaseID ==
-                BinaryPackageBuild.sourcepackagereleaseID,
+                BinaryPackageBuild.source_package_release_id,
             BinaryPackagePublishingHistory.binarypackagereleaseID ==
                 BinaryPackageRelease.id,
             BinaryPackagePublishingHistory.archiveID ==

=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py	2010-05-03 07:48:54 +0000
+++ lib/lp/soyuz/tests/test_archive.py	2010-05-06 11:12:37 +0000
@@ -321,8 +321,8 @@
 
         # Collect the source package releases for reference.
         self.sourcepackagereleases = [
-            self.builds_foo[0].sourcepackagerelease,
-            self.builds_bar[0].sourcepackagerelease,
+            self.builds_foo[0].source_package_release,
+            self.builds_bar[0].source_package_release,
             ]
 
     def test_getSourcePackageReleases_with_no_params(self):
@@ -336,7 +336,7 @@
 
         # Set the builds for one of the sprs to needs build.
         for build in self.builds_foo:
-            build.buildstate = BuildStatus.NEEDSBUILD
+            removeSecurityProxy(build).status = BuildStatus.NEEDSBUILD
 
         result = self.archive.getSourcePackageReleases(
             build_status=BuildStatus.NEEDSBUILD)
@@ -462,19 +462,23 @@
             duration += 60
             bq = build.buildqueue_record
             bq.lastscore = score
-            bq.estimated_duration = timedelta(seconds=duration)
+            removeSecurityProxy(bq).estimated_duration = timedelta(
+                seconds=duration)
 
     def _getBuildJobsByStatus(self, archive, status):
         # Return the count for archive build jobs with the given status.
         query = """
             SELECT COUNT(Job.id)
-            FROM Build, BuildPackageJob, BuildQueue, Job
+            FROM BinaryPackageBuild, BuildPackageJob, BuildQueue, Job,
+                 PackageBuild, BuildFarmJob
             WHERE
-                Build.archive = %s
-                AND BuildPackageJob.build = Build.id
+                BuildPackageJob.build = BinaryPackageBuild.id
                 AND BuildPackageJob.job = BuildQueue.job
                 AND Job.id = BuildQueue.job
-                AND Build.buildstate = %s
+                AND BinaryPackageBuild.package_build = PackageBuild.id
+                AND PackageBuild.archive = %s
+                AND PackageBuild.build_farm_job = BuildFarmJob.id
+                AND BuildFarmJob.status = %s
                 AND Job.status = %s;
         """ % sqlvalues(archive, BuildStatus.NEEDSBUILD, status)
 

=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuild.py'
--- lib/lp/soyuz/tests/test_binarypackagebuild.py	2010-05-06 11:12:34 +0000
+++ lib/lp/soyuz/tests/test_binarypackagebuild.py	2010-05-06 11:12:37 +0000
@@ -22,6 +22,7 @@
 from lp.soyuz.interfaces.buildpackagejob import IBuildPackageJob
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
+from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
 from lp.soyuz.model.buildpackagejob import BuildPackageJob
 from lp.soyuz.model.processor import ProcessorFamilySet
 from lp.soyuz.tests.soyuzbuilddhelpers import WaitingSlave
@@ -81,7 +82,7 @@
             status=PackagePublishingStatus.PUBLISHED)
 
         [depwait_build] = depwait_source.createMissingBuilds()
-        depwait_build.buildstate = BuildStatus.MANUALDEPWAIT
+        depwait_build.status = BuildStatus.MANUALDEPWAIT
         depwait_build.dependencies = u'dep-bin'
 
         return depwait_build
@@ -94,6 +95,7 @@
         """
         # Create a build in depwait.
         depwait_build = self._setupSimpleDepwaitContext()
+        depwait_build_id = depwait_build.id
 
         # Grab the relevant db records for later comparison.
         store = Store.of(depwait_build)
@@ -119,6 +121,13 @@
         self.assertEqual(
             store.find(BuildQueue, BuildQueue.id == build_queue_id).count(),
             0)
+        # But the build itself still exists.
+        self.assertEqual(
+            store.find(
+                BinaryPackageBuild,
+                BinaryPackageBuild.id == depwait_build_id).count(),
+            1)
+
 
     def testUpdateDependenciesWorks(self):
         # Calling `IBinaryPackageBuild.updateDependencies` makes the build
@@ -139,17 +148,17 @@
             AssertionError, depwait_build.updateDependencies)
 
         # Missing 'name'.
-        depwait_build.dependencies = '(>> version)'
+        depwait_build.dependencies = u'(>> version)'
         self.assertRaises(
             AssertionError, depwait_build.updateDependencies)
 
         # Missing 'version'.
-        depwait_build.dependencies = 'name (>>)'
+        depwait_build.dependencies = u'name (>>)'
         self.assertRaises(
             AssertionError, depwait_build.updateDependencies)
 
         # Missing comman between dependencies.
-        depwait_build.dependencies = 'name1 name2'
+        depwait_build.dependencies = u'name1 name2'
         self.assertRaises(
             AssertionError, depwait_build.updateDependencies)
 
@@ -289,11 +298,10 @@
         """Verify that storeBuildInfo sets any dependencies."""
         self.build.storeBuildInfo(
             self.build, None, {'dependencies': 'somepackage'})
-        self.assertIsNot(None, self.build.buildlog)
+        self.assertIsNot(None, self.build.log)
         self.assertEqual(self.builder, self.build.builder)
         self.assertEqual(u'somepackage', self.build.dependencies)
-        self.assertIsNot(None, self.build.datebuilt)
-        self.assertIsNot(None, self.build.buildduration)
+        self.assertIsNot(None, self.build.date_finished)
 
     def testWithoutDependencies(self):
         """Verify that storeBuildInfo clears the build's dependencies."""

=== modified file 'lib/lp/soyuz/tests/test_buildpackagejob.py'
--- lib/lp/soyuz/tests/test_buildpackagejob.py	2010-05-06 11:12:34 +0000
+++ lib/lp/soyuz/tests/test_buildpackagejob.py	2010-05-06 11:12:37 +0000
@@ -6,6 +6,7 @@
 from datetime import timedelta
 
 from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
 
 from canonical.launchpad.webapp.interfaces import (
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
@@ -26,7 +27,7 @@
 def find_job(test, name, processor='386'):
     """Find build and queue instance for the given source and processor."""
     for build in test.builds:
-        if (build.sourcepackagerelease.name == name
+        if (build.source_package_release.name == name
             and build.processor.name == processor):
             return (build, build.buildqueue_record)
     return (None, None)
@@ -203,7 +204,8 @@
             duration += 60
             bq = build.buildqueue_record
             bq.lastscore = score
-            bq.estimated_duration = timedelta(seconds=duration)
+            removeSecurityProxy(bq).estimated_duration = timedelta(
+                seconds=duration)
 
     def test_processor(self):
         # Test that BuildPackageJob returns the correct processor.

=== modified file 'lib/lp/soyuz/tests/test_hasbuildrecords.py'
--- lib/lp/soyuz/tests/test_hasbuildrecords.py	2010-05-06 11:12:34 +0000
+++ lib/lp/soyuz/tests/test_hasbuildrecords.py	2010-05-06 11:12:37 +0000
@@ -6,6 +6,7 @@
 import unittest
 
 from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
 
 from canonical.testing import LaunchpadZopelessLayer
 
@@ -49,7 +50,9 @@
         # in total, two of which are i386 and one hppa.
         i386_builds = self.builds[:]
         hppa_build = i386_builds.pop()
-        hppa_build.distroarchseries = self.publisher.distroseries['hppa']
+        removeSecurityProxy(
+            hppa_build).distro_arch_series = self.publisher.distroseries[
+                'hppa']
 
         builds = self.context.getBuildRecords(arch_tag="i386")
         self.assertContentEqual(i386_builds, builds)
@@ -103,16 +106,17 @@
     def setUp(self):
         super(TestSourcePackageHasBuildRecords, self).setUp()
 
-        gedit_name = self.builds[0].sourcepackagerelease.sourcepackagename
+        gedit_name = self.builds[0].source_package_release.sourcepackagename
         self.context = SourcePackage(
             gedit_name,
-            self.builds[0].distroarchseries.distroseries)
+            self.builds[0].distro_arch_series.distroseries)
 
         # Convert the other two builds to be builds of
         # gedit as well so that the one source package (gedit) will have
         # three builds.
-        self.builds[1].sourcepackagerelease.sourcepackagename = gedit_name
-        self.builds[2].sourcepackagerelease.sourcepackagename = gedit_name
+        for build in self.builds[1:3]:
+            spr = build.source_package_release
+            removeSecurityProxy(spr).sourcepackagename = gedit_name
 
 
 def test_suite():

=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py	2010-05-06 11:12:34 +0000
+++ lib/lp/soyuz/tests/test_publishing.py	2010-05-06 11:12:37 +0000
@@ -13,6 +13,7 @@
 
 import pytz
 from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
 
 from canonical.config import config
 from canonical.database.constants import UTC_NOW
@@ -361,10 +362,12 @@
         binarypackagerelease.addFile(alias)
 
         # Adjust the build record in way it looks complete.
-        build.buildstate = BuildStatus.FULLYBUILT
-        build.datebuilt = datetime.datetime(
-            2008, 1, 1, 0, 5, 0, tzinfo=pytz.timezone("UTC"))
-        build.buildduration = datetime.timedelta(minutes=5)
+        naked_build = removeSecurityProxy(build)
+        naked_build.status = BuildStatus.FULLYBUILT
+        naked_build.date_finished = datetime.datetime(
+            2008, 1, 1, 0, 5, 0, tzinfo=pytz.UTC)
+        naked_build.date_started = (
+            build.date_finished - datetime.timedelta(minutes=5))
         buildlog_filename = 'buildlog_%s-%s-%s.%s_%s_%s.txt.gz' % (
             build.distribution.name,
             build.distro_series.name,
@@ -372,7 +375,7 @@
             build.source_package_release.name,
             build.source_package_release.version,
             build.status.name)
-        build.buildlog = self.addMockFile(
+        naked_build.log = self.addMockFile(
             buildlog_filename, filecontent='Built!',
             restricted=build.archive.private)
 
@@ -938,7 +941,7 @@
         pubrec = self.getPubSource(architecturehintlist='any')
         builds = pubrec.createMissingBuilds()
         self.assertEquals(1, len(builds))
-        self.assertEquals(self.sparc_distroarch, builds[0].distroarchseries)
+        self.assertEquals(self.sparc_distroarch, builds[0].distro_arch_series)
 
     def test_createMissingBuilds_restricts_explicitlist(self):
         """createMissingBuilds() should limit builds targeted at a
@@ -947,7 +950,7 @@
         pubrec = self.getPubSource(architecturehintlist='sparc i386 avr')
         builds = pubrec.createMissingBuilds()
         self.assertEquals(1, len(builds))
-        self.assertEquals(self.sparc_distroarch, builds[0].distroarchseries)
+        self.assertEquals(self.sparc_distroarch, builds[0].distro_arch_series)
 
     def test_createMissingBuilds_restricts_all(self):
         """createMissingBuilds() should limit builds targeted at 'all'
@@ -957,7 +960,7 @@
         pubrec = self.getPubSource(architecturehintlist='all')
         builds = pubrec.createMissingBuilds()
         self.assertEquals(1, len(builds))
-        self.assertEquals(self.sparc_distroarch, builds[0].distroarchseries)
+        self.assertEquals(self.sparc_distroarch, builds[0].distro_arch_series)
 
     def test_createMissingBuilds_restrict_override(self):
         """createMissingBuilds() should limit builds targeted at 'any'
@@ -968,8 +971,8 @@
         pubrec = self.getPubSource(architecturehintlist='any')
         builds = pubrec.createMissingBuilds()
         self.assertEquals(2, len(builds))
-        self.assertEquals(self.avr_distroarch, builds[0].distroarchseries)
-        self.assertEquals(self.sparc_distroarch, builds[1].distroarchseries)
+        self.assertEquals(self.avr_distroarch, builds[0].distro_arch_series)
+        self.assertEquals(self.sparc_distroarch, builds[1].distro_arch_series)
 
 
 def test_suite():

=== modified file 'lib/lp/soyuz/tests/test_publishing_models.py'
--- lib/lp/soyuz/tests/test_publishing_models.py	2010-05-06 11:12:34 +0000
+++ lib/lp/soyuz/tests/test_publishing_models.py	2010-05-06 11:12:37 +0000
@@ -6,6 +6,7 @@
 import unittest
 
 from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
 
 from canonical.database.constants import UTC_NOW
 from canonical.testing import LaunchpadZopelessLayer
@@ -27,7 +28,7 @@
 
         # Ensure all the builds have been built.
         for build in self.builds:
-            build.buildstate = BuildStatus.FULLYBUILT
+            removeSecurityProxy(build).status = BuildStatus.FULLYBUILT
         self.publishing_set = getUtility(IPublishingSet)
 
     def _getBuildsForResults(self, results):