Merge lp:~michael.nelson/launchpad/567922-fix-ec2-failures-after-db-devel-merge 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

Overview
========
After getting most of the unit-tests running, I re-merged a fresh db-devel into my pipeline, resolved the conflicts, fixed the obvious errors and sent it off to ec2test. This branch is starts to fix the new failures.

To test
=======

make schema
bin/test -vv -t test_buildfarmjob -t test_buildqueue -t test_manager -t test_buildd_cronscripts -t test_copypackage -t test_populatearchive -t build-estimated-dispatch-time.txt -t buildd-scoring.txt -t buildd-slavescanner.txt -t archive-views.txt

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/lp/buildmaster/configure.zcml'
--- lib/lp/buildmaster/configure.zcml	2010-05-27 13:26:43 +0000
+++ lib/lp/buildmaster/configure.zcml	2010-05-27 13:26:53 +0000
@@ -87,7 +87,7 @@
         <!-- Grant permissions to write on BuildQueue and Build. -->
         <require
             permission="zope.Public"
-            set_attributes="lastscore builder logtail date_started"/>
+            set_attributes="lastscore estimated_duration builder logtail date_started"/>
     </class>
 
 

=== modified file 'lib/lp/buildmaster/interfaces/packagebuild.py'
--- lib/lp/buildmaster/interfaces/packagebuild.py	2010-05-27 13:26:43 +0000
+++ lib/lp/buildmaster/interfaces/packagebuild.py	2010-05-27 13:26:53 +0000
@@ -82,7 +82,7 @@
             title=_("Distribution series"), required=True,
             description=_("Shortcut for its distribution series.")))
 
-    def getUploaderCommand(distro_series, upload_leaf, uploader_logfilename):
+    def getUploaderCommand(package_build, upload_leaf, uploader_logfilename):
         """Get the command to run as the uploader.
 
         :return: A list of command line arguments, beginning with the

=== modified file 'lib/lp/buildmaster/model/buildbase.py'
--- lib/lp/buildmaster/model/buildbase.py	2010-05-27 13:26:43 +0000
+++ lib/lp/buildmaster/model/buildbase.py	2010-05-27 13:26:53 +0000
@@ -63,7 +63,8 @@
         """Return the directory that things will be stored in."""
         return os.path.join(config.builddmaster.root, 'incoming', upload_leaf)
 
-    def getUploaderCommand(self, upload_leaf, uploader_logfilename):
+    @staticmethod
+    def getUploaderCommand(build, upload_leaf, uploader_logfilename):
         """See `IBuildBase`."""
         root = os.path.abspath(config.builddmaster.root)
         uploader_command = list(config.builddmaster.uploader.split())
@@ -71,12 +72,12 @@
         # add extra arguments for processing a binary upload
         extra_args = [
             "--log-file", "%s" % uploader_logfilename,
-            "-d", "%s" % self.distribution.name,
-            "-s", "%s" % (self.distro_series.name +
-                          pocketsuffix[self.pocket]),
-            "-b", "%s" % self.id,
+            "-d", "%s" % build.distribution.name,
+            "-s", "%s" % (build.distro_series.name +
+                          pocketsuffix[build.pocket]),
+            "-b", "%s" % build.id,
             "-J", "%s" % upload_leaf,
-            '--context=%s' % self.policy_name,
+            '--context=%s' % build.policy_name,
             "%s" % root,
             ]
 
@@ -204,7 +205,7 @@
             uploader_logfilename = os.path.join(
                 upload_dir, UPLOAD_LOG_FILENAME)
             uploader_command = build.getUploaderCommand(
-                upload_leaf, uploader_logfilename)
+                build, upload_leaf, uploader_logfilename)
             logger.debug("Saving uploader log at '%s'" % uploader_logfilename)
 
             logger.info("Invoking uploader on %s" % root)

=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
--- lib/lp/buildmaster/model/buildfarmjob.py	2010-05-27 13:26:43 +0000
+++ lib/lp/buildmaster/model/buildfarmjob.py	2010-05-27 13:26:53 +0000
@@ -62,7 +62,7 @@
         """See `IBuildFarmJobOld`."""
         raise NotImplementedError
 
-    def getByJob(self):
+    def getByJob(self, job):
         """See `IBuildFarmJobOld`."""
         raise NotImplementedError
 

=== modified file 'lib/lp/buildmaster/model/buildfarmjobbehavior.py'
--- lib/lp/buildmaster/model/buildfarmjobbehavior.py	2010-05-27 13:26:43 +0000
+++ lib/lp/buildmaster/model/buildfarmjobbehavior.py	2010-05-27 13:26:53 +0000
@@ -184,8 +184,7 @@
         # XXX: dsilvers 2005-03-02: Confirm the builder has the right build?
 
         build = queueItem.specific_job.build
-        build.handleStatus(
-            build, build_status, librarian, slave_status)
+        build.handleStatus(build_status, librarian, slave_status)
 
 
 class IdleBuildBehavior(BuildFarmJobBehaviorBase):

=== modified file 'lib/lp/buildmaster/model/packagebuild.py'
--- lib/lp/buildmaster/model/packagebuild.py	2010-05-27 13:26:43 +0000
+++ lib/lp/buildmaster/model/packagebuild.py	2010-05-27 13:26:53 +0000
@@ -122,11 +122,10 @@
         return BuildBase.getUploadDir(upload_leaf)
 
     @staticmethod
-    def getUploaderCommand(package_build, distro_series, upload_leaf,
-                           upload_logfilename):
+    def getUploaderCommand(package_build, upload_leaf, upload_logfilename):
         """See `IPackageBuild`."""
         return BuildBase.getUploaderCommand(
-            package_build, distro_series, upload_leaf, upload_logfilename)
+            package_build, upload_leaf, upload_logfilename)
 
     @staticmethod
     def getLogFromSlave(package_build):
@@ -182,7 +181,7 @@
 
     def queueBuild(self, suspended=False):
         """See `IPackageBuild`."""
-        return BuildBase.queueBuild(self, suspended=False)
+        return BuildBase.queueBuild(self, suspended=suspended)
 
     def handleStatus(self, status, librarian, slave_status):
         """See `IPackageBuild`."""

=== modified file 'lib/lp/buildmaster/tests/test_buildbase.py'
--- lib/lp/buildmaster/tests/test_buildbase.py	2010-05-27 13:26:43 +0000
+++ lib/lp/buildmaster/tests/test_buildbase.py	2010-05-27 13:26:53 +0000
@@ -115,7 +115,7 @@
              os.path.abspath(config.builddmaster.root),
              ])
         uploader_command = build_base.getUploaderCommand(
-            upload_leaf, log_file)
+            build_base, upload_leaf, log_file)
         self.assertEqual(config_args, uploader_command)
 
 

=== modified file 'lib/lp/buildmaster/tests/test_buildqueue.py'
--- lib/lp/buildmaster/tests/test_buildqueue.py	2010-04-21 11:51:26 +0000
+++ lib/lp/buildmaster/tests/test_buildqueue.py	2010-05-27 13:26:53 +0000
@@ -11,6 +11,7 @@
 from zope import component
 from zope.component import getGlobalSiteManager, getUtility
 from zope.interface.verify import verifyObject
+from zope.security.proxy import removeSecurityProxy
 
 from canonical.launchpad.webapp.interfaces import (
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
@@ -45,7 +46,7 @@
     for build in test.builds:
         bq = build.buildqueue_record
         source = None
-        for attr in ('sourcepackagerelease', 'sourcepackagename'):
+        for attr in ('source_package_release', 'sourcepackagename'):
             source = getattr(build, attr, None)
             if source is not None:
                 break
@@ -105,7 +106,7 @@
     # Monkey-patch BuildQueueSet._now() so it returns a constant time stamp
     # that's not too far in the future. This avoids spurious test failures.
     monkey_patch_the_now_property(bq)
-    delay = bq._estimateTimeToNextBuilder()
+    delay = removeSecurityProxy(bq)._estimateTimeToNextBuilder()
     test.assertTrue(
         delay <= min_time,
         "Wrong min time to next available builder (%s > %s)"
@@ -122,7 +123,8 @@
 def check_delay_for_job(test, the_job, delay):
     # Obtain the builder statistics pertaining to this job.
     builder_data = get_builder_data()
-    estimated_delay = the_job._estimateJobDelay(builder_data)
+    estimated_delay = removeSecurityProxy(the_job)._estimateJobDelay(
+        builder_data)
     test.assertEqual(delay, estimated_delay)
 
 
@@ -144,12 +146,13 @@
     This avoids spurious test failures.
     """
     # Use the date/time the job started if available.
+    naked_buildqueue = removeSecurityProxy(buildqueue)
     if buildqueue.job.date_started:
         time_stamp = buildqueue.job.date_started
     else:
-        time_stamp = buildqueue._now()
+        time_stamp = naked_buildqueue._now()
 
-    buildqueue._now = FakeMethod(result=time_stamp)
+    naked_buildqueue._now = FakeMethod(result=time_stamp)
     return time_stamp
 
 
@@ -475,7 +478,10 @@
         # The build in question is an x86/native one.
         self.assertEqual(self.x86_proc.id, build.processor.id)
         self.assertEqual(False, build.is_virtualized)
-        bq = build.buildqueue_record
+
+        # To test this non-interface method, we need to remove the
+        # security proxy.
+        bq = removeSecurityProxy(build.buildqueue_record)
         builder_stats = get_builder_data()
         # We have 4 x86 native builders.
         self.assertEqual(
@@ -511,7 +517,7 @@
         # will be free again.
         build, bq = find_job(self, 'flex')
         bq.reset()
-        free_count = bq._getFreeBuildersCount(
+        free_count = removeSecurityProxy(bq)._getFreeBuildersCount(
             build.processor, build.is_virtualized)
         self.assertEqual(1, free_count)
 
@@ -1095,7 +1101,7 @@
         for build in self.builds:
             bq = build.buildqueue_record
             if bq.processor == self.hppa_proc:
-                bq.virtualized = True
+                removeSecurityProxy(bq).virtualized = True
         job = self.factory.makeSourcePackageRecipeBuildJob(
             virtualized=True, estimated_duration=332,
             sourcename='xxr-openssh-client', score=1050)
@@ -1111,7 +1117,8 @@
 
         flex_build, flex_job = find_job(self, 'flex', 'hppa')
         # The head job platform is the one of job #21 (xxr-openssh-client).
-        self.assertEquals((None, True), flex_job._getHeadJobPlatform())
+        self.assertEquals(
+            (None, True), removeSecurityProxy(flex_job)._getHeadJobPlatform())
         # The delay will be 900 (= 15*60) + 332 seconds
         check_delay_for_job(self, flex_job, 1232)
 
@@ -1133,7 +1140,8 @@
         #   20,      xx-recipe-zsh, p: None, v:False e:0:03:42 *** s: 1053
 
         # The newly added 'xxr-gwibber' job is the new head job now.
-        self.assertEquals((None, None), flex_job._getHeadJobPlatform())
+        self.assertEquals(
+            (None, None), removeSecurityProxy(flex_job)._getHeadJobPlatform())
         # The newly added 'xxr-gwibber' job now weighs in as well and the
         # delay is 900 (= 15*60) + (332+111)/2 seconds
         check_delay_for_job(self, flex_job, 1121)
@@ -1142,7 +1150,9 @@
         # 'xxr-openssh-client' jobs since the 'virtualized' values do not
         # match.
         flex_build, flex_job = find_job(self, 'flex', '386')
-        self.assertEquals((None, False), flex_job._getHeadJobPlatform())
+        self.assertEquals(
+            (None, False),
+            removeSecurityProxy(flex_job)._getHeadJobPlatform())
         # delay is 960 (= 16*60) + 222 seconds
         check_delay_for_job(self, flex_job, 1182)
 
@@ -1222,7 +1232,7 @@
         for build in self.builds:
             bq = build.buildqueue_record
             if bq.processor == self.x86_proc:
-                bq.virtualized = True
+                removeSecurityProxy(bq).virtualized = True
 
     def test_pending_jobs_only(self):
         # Let's see the assertion fail for a job that's not pending any more.

=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py	2010-04-23 13:42:50 +0000
+++ lib/lp/buildmaster/tests/test_manager.py	2010-05-27 13:26:53 +0000
@@ -586,7 +586,7 @@
         self.assertTrue(job.date_started is not None)
         self.assertEqual(job.job.status, JobStatus.RUNNING)
         build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(job)
-        self.assertEqual(build.buildstate, BuildStatus.BUILDING)
+        self.assertEqual(build.status, BuildStatus.BUILDING)
         self.assertEqual(job.logtail, logtail)
 
     def _getManager(self):
@@ -710,7 +710,7 @@
         self.assertTrue(job.builder is None)
         self.assertTrue(job.date_started is None)
         build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(job)
-        self.assertEqual(build.buildstate, BuildStatus.NEEDSBUILD)
+        self.assertEqual(build.status, BuildStatus.NEEDSBUILD)
 
     def testScanRescuesJobFromBrokenBuilder(self):
         # The job assigned to a broken builder is rescued.
@@ -798,7 +798,7 @@
             'i386 build of mozilla-firefox 0.9 in ubuntu hoary RELEASE',
             build.title)
 
-        self.assertEqual('BUILDING', build.buildstate.name)
+        self.assertEqual('BUILDING', build.status.name)
         self.assertNotEqual(None, job.builder)
         self.assertNotEqual(None, job.date_started)
         self.assertNotEqual(None, job.logtail)
@@ -811,7 +811,7 @@
         """Re-fetch the `IBuildQueue` record and check if it's clean."""
         job = getUtility(IBuildQueueSet).get(job_id)
         build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(job)
-        self.assertEqual('NEEDSBUILD', build.buildstate.name)
+        self.assertEqual('NEEDSBUILD', build.status.name)
         self.assertEqual(None, job.builder)
         self.assertEqual(None, job.date_started)
         self.assertEqual(None, job.logtail)

=== modified file 'lib/lp/soyuz/browser/tests/archive-views.txt'
--- lib/lp/soyuz/browser/tests/archive-views.txt	2010-04-29 09:53:56 +0000
+++ lib/lp/soyuz/browser/tests/archive-views.txt	2010-05-27 13:26:53 +0000
@@ -361,7 +361,7 @@
     >>> warty_hppa = getUtility(IDistributionSet)['ubuntu']['warty']['hppa']
     >>> source = view.filtered_sources[0]
     >>> ignore = source.sourcepackagerelease.createBuild(
-    ...     distroarchseries=warty_hppa, archive=view.context,
+    ...     distro_arch_series=warty_hppa, archive=view.context,
     ...     pocket=source.pocket)
     >>> builds = getUtility(IBinaryPackageBuildSet).getBuildsForArchive(
     ...     view.context)
@@ -374,9 +374,9 @@
     i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE
 
     >>> login('[e-mail]')
-    >>> builds[0].buildstate = BuildStatus.NEEDSBUILD
-    >>> builds[1].buildstate = BuildStatus.BUILDING
-    >>> builds[2].buildstate = BuildStatus.BUILDING
+    >>> builds[0].status = BuildStatus.NEEDSBUILD
+    >>> builds[1].status = BuildStatus.BUILDING
+    >>> builds[2].status = BuildStatus.BUILDING
     >>> login(ANONYMOUS)
 
     >>> view.num_pkgs_building
@@ -386,7 +386,7 @@
 of packages that are currently building.
 
     >>> login('[e-mail]')
-    >>> builds[4].buildstate = BuildStatus.NEEDSBUILD
+    >>> builds[4].status = BuildStatus.NEEDSBUILD
     >>> login(ANONYMOUS)
     >>> view.num_pkgs_building
     {'building': 2, 'waiting': 1, 'total': 3}
@@ -395,7 +395,7 @@
 to be building:
 
     >>> login('[e-mail]')
-    >>> builds[4].buildstate = BuildStatus.BUILDING
+    >>> builds[4].status = BuildStatus.BUILDING
     >>> login(ANONYMOUS)
     >>> view.num_pkgs_building
     {'building': 3, 'waiting': 0, 'total': 3}

=== modified file 'lib/lp/soyuz/doc/build-estimated-dispatch-time.txt'
--- lib/lp/soyuz/doc/build-estimated-dispatch-time.txt	2010-04-09 15:46:09 +0000
+++ lib/lp/soyuz/doc/build-estimated-dispatch-time.txt	2010-05-27 13:26:53 +0000
@@ -50,7 +50,7 @@
     ...     hoary.main_archive)
     >>> alsa_bqueue = alsa_build.queueBuild()
     >>> alsa_bqueue.lastscore = 500
-    >>> alsa_build.buildstate = BuildStatus.NEEDSBUILD
+    >>> alsa_build.status = BuildStatus.NEEDSBUILD
 
 Access the currently building job via the builder.
 
@@ -64,7 +64,7 @@
 
 Make sure the job at hand is currently being built.
 
-    >>> cur_build.buildstate == BuildStatus.BUILDING
+    >>> cur_build.status == BuildStatus.BUILDING
     True
 
 The start time estimation mechanism for a pending job N depends on
@@ -124,7 +124,7 @@
     >>> pmount_bqueue.lastscore = 66
     >>> removeSecurityProxy(pmount_bqueue).estimated_duration = (
     ...     timedelta(minutes=12))
-    >>> pmount_build.buildstate = BuildStatus.NEEDSBUILD
+    >>> pmount_build.status = BuildStatus.NEEDSBUILD
 
 Followed by another build for the 'iceweasel' source package that is added
 to mark's PPA.
@@ -142,7 +142,7 @@
     >>> removeSecurityProxy(iceweasel_bqueue).estimated_duration = (
     ...     timedelta(minutes=48))
     >>> iceweasel_bqueue.lastscore = 666
-    >>> iceweasel_build.buildstate = BuildStatus.NEEDSBUILD
+    >>> iceweasel_build.status = BuildStatus.NEEDSBUILD
 
 Since the 'iceweasel' build has a higher score (666) than the 'pmount'
 build (66) its estimated dispatch time is essentially "now".

=== modified file 'lib/lp/soyuz/doc/buildd-scoring.txt'
--- lib/lp/soyuz/doc/buildd-scoring.txt	2010-04-09 15:46:09 +0000
+++ lib/lp/soyuz/doc/buildd-scoring.txt	2010-05-27 13:26:53 +0000
@@ -65,8 +65,10 @@
     ...         hoary386, pub.pocket, pub.archive)
     ...
     ...     build_queue = build.queueBuild()
-    ...     build_queue.job.date_created = date_created
-    ...     build_queue.manual = manual
+    ...     from zope.security.proxy import removeSecurityProxy
+    ...     naked_build_queue = removeSecurityProxy(build_queue)
+    ...     naked_build_queue.job.date_created = date_created
+    ...     naked_build_queue.manual = manual
     ...
     ...     return build_queue
 

=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
--- lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-05-27 13:26:43 +0000
+++ lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-05-27 13:26:53 +0000
@@ -90,8 +90,7 @@
 
     >>> default_start = datetime.datetime(2005, 1, 1, 8, 0, 0, tzinfo=UTC)
     >>> def setupBuildQueue(build_queue, builder):
-    ...      build_queue.builder = builder
-    ...      build_queue.setDateStarted(default_start)
+    ...     build_queue.markAsBuilding(builder)
 
 Remove any previous buildmaster ROOT directory, to avoid any garbage
 lock conflict (it would be recreated automatically if necessary)
@@ -105,7 +104,7 @@
 Let's check the procedures to verify/collect running build process:
 
   WAITING - PACKAGEFAIL -> Package has failed to build, notice from
-  builder is stored, but Build.buildstate is mark as 'Failed to Build':
+  builder is stored, but Build.status is mark as 'Failed to Build':
 
 Get a builder from the sample data:
 
@@ -139,19 +138,19 @@
     >>> a_builder.updateBuild(bqItem3)
     >>> build.builder is not None
     True
-    >>> build.datebuilt is not None
-    True
-    >>> build.buildduration is not None
-    True
-    >>> build.buildlog is not None
+    >>> build.date_finished is not None
+    True
+    >>> build.duration is not None
+    True
+    >>> build.log is not None
     True
     >>> check_mail_sent(last_stub_mail_count)
     True
-    >>> build.buildstate.title
+    >>> build.status.title
     'Failed to build'
 
 WAITING - DEPWAIT -> a required dependency is missing, again notice
-from builder, but Build.buildstate has the right state:
+from builder, but Build.status has the right state:
 
     >>> bqItem4 = a_build.queueBuild()
     >>> setupBuildQueue(bqItem4, a_builder)
@@ -170,17 +169,17 @@
     CRITICAL:slave-scanner:***** bob is MANUALDEPWAIT *****
     >>> build.builder is not None
     True
-    >>> build.datebuilt is not None
-    True
-    >>> build.buildduration is not None
-    True
-    >>> build.buildlog is not None
+    >>> build.date_finished is not None
+    True
+    >>> build.duration is not None
+    True
+    >>> build.log is not None
     True
     >>> check_mail_sent(last_stub_mail_count)
     False
     >>> build.dependencies
     u'baz (>= 1.0.1)'
-    >>> build.buildstate.title
+    >>> build.status.title
     'Dependency wait'
 
 WAITING - CHROOTFAIL -> the Chroot for this distroseries is damage, nor
@@ -199,15 +198,15 @@
     CRITICAL:slave-scanner:***** bob is CHROOTWAIT *****
     >>> build.builder is not None
     True
-    >>> build.datebuilt is not None
-    True
-    >>> build.buildduration is not None
-    True
-    >>> build.buildlog is not None
+    >>> build.date_finished is not None
+    True
+    >>> build.duration is not None
+    True
+    >>> build.log is not None
     True
     >>> check_mail_sent(last_stub_mail_count)
     True
-    >>> build.buildstate.title
+    >>> build.status.title
     'Chroot problem'
 
 WAITING - BUILDERFAIL -> builder has failed by internal error, job is available for next build round:
@@ -234,7 +233,7 @@
     >>> check_mail_sent(last_stub_mail_count)
     False
     >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bqItem6)
-    >>> print build.buildstate.title
+    >>> print build.status.title
     Needs building
     >>> job = bqItem6.specific_job.job
     >>> print job.status.title
@@ -286,7 +285,7 @@
     >>> a_builder.updateBuild(bqItem8)
     >>> bqItem8.builder is None
     True
-    >>> print bqItem8.specific_job.build.buildstate.name
+    >>> print bqItem8.specific_job.build.status.name
     NEEDSBUILD
 
 Cleanup in preparation for the next test:
@@ -347,15 +346,15 @@
     WARNING:slave-scanner:Build ... upload failed.
     >>> build.builder is not None
     True
-    >>> build.datebuilt is not None
-    True
-    >>> build.buildduration is not None
-    True
-    >>> build.buildlog is not None
+    >>> build.date_finished is not None
+    True
+    >>> build.duration is not None
+    True
+    >>> build.log is not None
     True
     >>> check_mail_sent(last_stub_mail_count)
     True
-    >>> build.buildstate.title
+    >>> build.status.title
     'Failed to upload'
 
 Let's check the emails generated by this 'failure'
@@ -380,7 +379,7 @@
     ...
     X-Launchpad-Build-State: FAILEDTOUPLOAD
     ...
-    * Build Log: http://.../...i386.mozilla-firefox_0.9_NEEDSBUILD.txt.gz
+    * Build Log: http://.../...i386.mozilla-firefox_0.9_BUILDING.txt.gz
     ...
     Upload log:
     INFO    Creating lockfile:...
@@ -396,7 +395,7 @@
     >>> build.upload_log is not None
     True
 
-What we can clearly notice is that the buildlog is still containing
+What we can clearly notice is that the log is still containing
 the old build state (BUILDING) in its name. This is a minor problem
 that can be sorted by modifying the execution order of procedures
 inside Buildergroup.buildStatus_OK method.
@@ -431,7 +430,7 @@
 the build record to FULLYBUILT, as the process-upload would do:
 
     >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
-    >>> build.buildstate = BuildStatus.FULLYBUILT
+    >>> build.status = BuildStatus.FULLYBUILT
 
 Now the updateBuild should recognize this build record as a
 Successfully built and uploaded procedure, not sending any
@@ -440,13 +439,13 @@
     >>> a_builder.updateBuild(bqItem10)
     >>> build.builder is not None
     True
-    >>> build.datebuilt is not None
-    True
-    >>> build.buildduration is not None
-    True
-    >>> build.buildlog is not None
-    True
-    >>> build.buildstate.title
+    >>> build.date_finished is not None
+    True
+    >>> build.duration is not None
+    True
+    >>> build.log is not None
+    True
+    >>> build.status.title
     'Successfully built'
     >>> check_mail_sent(last_stub_mail_count)
     False
@@ -484,7 +483,7 @@
     >>> check_mail_sent(last_stub_mail_count)
     False
     >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bqItem11)
-    >>> print build.buildstate.title
+    >>> print build.status.title
     Needs building
     >>> job = bqItem11.specific_job.job
     >>> print job.status.title
@@ -517,23 +516,24 @@
 
     >>> bqItem12.builder = None
 
-The buildlog is collected and compressed locally using gzip algorithm,
+The log is collected and compressed locally using gzip algorithm,
 let's see how this method works:
 
     >>> bqItem10 = getUtility(IBinaryPackageBuildSet).getByBuildID(
     ...     6).queueBuild()
     >>> setupBuildQueue(bqItem10, a_builder)
+    >>> build = bqItem10.specific_job.build
+    >>> build.status = BuildStatus.FULLYBUILT
     >>> bqItem10.builder.setSlaveForTesting(WaitingSlave('BuildStatus.OK'))
 
-Before collecting and processing the buildlog we will store the files
+Before collecting and processing the log we will store the files
 already created in /tmp so we can verify later that this mechanism is
 not leaving any temporary file behind. See bug #172798.
 
     >>> old_tmps = os.listdir('/tmp')
 
-Collect and process the buildlog.
+Collect and process the log.
 
-    >>> build = bqItem10.specific_job.build
     >>> logfile_alias = build.getLogFromSlave(build)
 
 Audit the /tmp for lost temporary files, there should not be any new
@@ -543,7 +543,7 @@
     >>> sorted(os.listdir('/tmp')) == sorted(old_tmps)
     True
 
-The buildlog was compressed and directly transferred to Librarian.
+The log was compressed and directly transferred to Librarian.
 
     >>> from canonical.launchpad.interfaces import ILibraryFileAliasSet
     >>> logfile = getUtility(ILibraryFileAliasSet)[logfile_alias]
@@ -558,7 +558,7 @@
 
     >>> commit()
 
-Check if the buildlog content is correct and accessible via the
+Check if the log content is correct and accessible via the
 library file directly and via Librarian http front-end.
 
 Since LibrarianFileAlias does not implement required attributes for
@@ -592,7 +592,7 @@
 
     >>> os.remove(fname)
 
-The Librarian serves buildlog files with 'gzip' content-encoding and
+The Librarian serves log files with 'gzip' content-encoding and
 'text/plain' content-type. This combination instructs the browser to
 decompress the file and display it inline, which makes it easier for
 users to view it.
@@ -700,7 +700,7 @@
     >>> current_job = a_builder.currentjob
     >>> resurrect_build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(
     ...     current_job)
-    >>> resurrect_build.buildstate = BuildStatus.NEEDSBUILD
+    >>> resurrect_build.status = BuildStatus.NEEDSBUILD
     >>> syncUpdate(resurrect_build)
     >>> current_job.builder = None
     >>> current_job.setDateStarted(None)
@@ -713,7 +713,7 @@
     >>> old_candidate = removeSecurityProxy(a_builder)._findBuildCandidate()
     >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(
     ...     old_candidate)
-    >>> print build.buildstate.name
+    >>> print build.status.name
     NEEDSBUILD
 
 The 'candidate' is constant until we dispatch it.
@@ -747,7 +747,7 @@
     >>> from canonical.launchpad.interfaces import PackagePublishingStatus
     >>> from canonical.testing.layers import LaunchpadZopelessLayer
 
-    >>> spr = build.sourcepackagerelease
+    >>> spr = build.source_package_release
     >>> pub = removeSecurityProxy(build).current_source_publication
     >>> commit()
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
@@ -764,7 +764,7 @@
 Because the 'previous' candidate was marked as superseded, so it's not
 part of the candidates list anymore.
 
-    >>> print build.buildstate.name
+    >>> print build.status.name
     SUPERSEDED
 
 If the candidate is for a private build whose source has not been
@@ -825,7 +825,7 @@
 
     >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(
     ...     current_job)
-    >>> print build.buildstate.name
+    >>> print build.status.name
     NEEDSBUILD
 
     >>> another_candidate = removeSecurityProxy(
@@ -833,7 +833,7 @@
     >>> print another_candidate
     None
 
-    >>> print build.buildstate.name
+    >>> print build.status.name
     SUPERSEDED
 
 We'll reset the archive back to non-private for further tests:
@@ -1060,7 +1060,7 @@
     >>> login('[e-mail]')
     >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(
     ...     candidate)
-    >>> for build_file in build.sourcepackagerelease.files:
+    >>> for build_file in build.source_package_release.files:
     ...     removeSecurityProxy(build_file).libraryfile.restricted = True
     >>> private_ppa = factory.makeArchive(
     ...     owner=cprov_archive.owner, name='pppa', private=True,
@@ -1121,7 +1121,7 @@
 We will create an ancestry in the primary archive target to the 'main'
 component and this time the dispatching will follow that component.
 
-    >>> sourcename = build.sourcepackagerelease.name
+    >>> sourcename = build.source_package_release.name
 
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
     >>> login('[e-mail]')
@@ -1147,7 +1147,7 @@
 
     >>> candidate.destroySelf()
 
-Since this is a build in a private archive, the buildlog was uploaded to
+Since this is a build in a private archive, the log was uploaded to
 the restricted librarian.
 
     >>> candidate = a_build.queueBuild()
@@ -1161,7 +1161,7 @@
     >>> build.archive.private
     True
 
-    >>> lfa = build.buildlog
+    >>> lfa = build.log
     >>> lfa.restricted
     True
     >>> print lfa.filename
@@ -1177,7 +1177,7 @@
       ...
     DownloadFailed: Alias ... cannot be downloaded from this client.
 
-Accessing the buildlog via the restricted librarian will work as expected.
+Accessing the log via the restricted librarian will work as expected.
 
     >>> import urlparse
     >>> from canonical.librarian.interfaces import IRestrictedLibrarianClient
@@ -1199,7 +1199,7 @@
 
     >>> removeSecurityProxy(build).archive = cprov_archive
     >>> cprov_archive.require_virtualized = True
-    >>> for build_file in a_build.sourcepackagerelease.files:
+    >>> for build_file in a_build.source_package_release.files:
     ...     removeSecurityProxy(build_file).libraryfile.restricted = False
     >>> mark_archive = getUtility(IPersonSet).getByName('mark').archive
 
@@ -1289,7 +1289,7 @@
     >>> hoary_evo = hoary.getSourcePackage(
     ...    'evolution').currentrelease.sourcepackagerelease
     >>> updates_build = hoary_evo.createBuild(
-    ...     distroarchseries=hoary_i386,
+    ...     distro_arch_series=hoary_i386,
     ...     pocket=PackagePublishingPocket.UPDATES,
     ...     processor=hoary_i386.default_processor,
     ...     archive=hoary_i386.main_archive)
@@ -1387,7 +1387,7 @@
     >>> a_builder.currentjob.destroySelf()
 
     >>> bqItem3 = a_build.queueBuild()
-    >>> removeSecurityProxy(build).buildstate = (
+    >>> removeSecurityProxy(build).status = (
     ...     BuildStatus.NEEDSBUILD)
     >>> removeSecurityProxy(build).pocket = (
     ...     PackagePublishingPocket.SECURITY)

=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/binarypackagebuild.py	2010-05-27 13:26:43 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py	2010-05-27 13:26:53 +0000
@@ -20,7 +20,6 @@
     Desc, In, Join, LeftJoin)
 from storm.store import Store
 from sqlobject import SQLObjectNotFound
-from sqlobject.sqlbuilder import AND, IN
 
 from canonical.config import config
 from canonical.database.sqlbase import quote_like, SQLBase, sqlvalues
@@ -629,7 +628,7 @@
         else:
             # completed states (success and failure)
             buildduration = DurationFormatterAPI(
-                self.date_finished - self.date_started).approximateduration()
+                self.duration).approximateduration()
             buildlog_url = self.log_url
             builder_url = canonical_url(self.builder)
 
@@ -739,11 +738,13 @@
             return None
 
         archseries_ids = [d.id for d in archseries]
-
-        return BinaryPackageBuild.select(
-            AND(BinaryPackageBuild.q.buildstate==BuildStatus.NEEDSBUILD,
-                IN(BinaryPackageBuild.q.distroarchseriesID, archseries_ids))
-            )
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        return store.find(
+            BinaryPackageBuild,
+            In(BinaryPackageBuild.distro_arch_series_id, archseries_ids),
+            BinaryPackageBuild.package_build == PackageBuild.id,
+            PackageBuild.build_farm_job == BuildFarmJob.id,
+            BuildFarmJob.status == BuildStatus.NEEDSBUILD)
 
     def handleOptionalParamsForBuildQueries(
         self, queries, tables, status=None, name=None, pocket=None,
@@ -1140,17 +1141,21 @@
         arch_ids = [d.id for d in archseries]
 
         query = """
-           Build.distroarchseries IN %s AND
-           Build.buildstate = %s AND
+           BinaryPackageBuild.distro_arch_series IN %s AND
+           BinaryPackageBuild.package_build = PackageBuild.id AND
+           PackageBuild.build_farm_job = BuildFarmJob.id AND
+           BuildFarmJob.status = %s AND
            BuildQueue.job_type = %s AND
            BuildQueue.job = BuildPackageJob.job AND
-           BuildPackageJob.build = build.id AND
+           BuildPackageJob.build = BinaryPackageBuild.id AND
            BuildQueue.builder IS NULL
         """ % sqlvalues(
             arch_ids, BuildStatus.NEEDSBUILD, BuildFarmJobType.PACKAGEBUILD)
 
         candidates = BuildQueue.select(
-            query, clauseTables=['Build', 'BuildPackageJob'],
+            query, clauseTables=[
+                'BinaryPackageBuild', 'PackageBuild', 'BuildFarmJob',
+                'BuildPackageJob'],
             orderBy=['-BuildQueue.lastscore'])
 
         return candidates

=== modified file 'lib/lp/soyuz/model/binarypackagebuildbehavior.py'
--- lib/lp/soyuz/model/binarypackagebuildbehavior.py	2010-05-27 13:26:43 +0000
+++ lib/lp/soyuz/model/binarypackagebuildbehavior.py	2010-05-27 13:26:53 +0000
@@ -122,7 +122,8 @@
 
         # This should already have been checked earlier, but just check again
         # here in case of programmer errors.
-        reason = build.archive.checkUploadToPocket(build.distroseries,
+        reason = build.archive.checkUploadToPocket(
+            build.distro_series,
             build.pocket)
         assert reason is None, (
                 "%s (%s) can not be built for pocket %s: invalid pocket due "

=== modified file 'lib/lp/soyuz/scripts/buildd.py'
--- lib/lp/soyuz/scripts/buildd.py	2010-04-09 15:46:09 +0000
+++ lib/lp/soyuz/scripts/buildd.py	2010-05-27 13:26:53 +0000
@@ -169,9 +169,9 @@
 
         for build in builds:
             if not build.buildqueue_record:
-                name = build.sourcepackagerelease.name
-                version = build.sourcepackagerelease.version
-                tag = build.distroarchseries.architecturetag
+                name = build.source_package_release.name
+                version = build.source_package_release.version
+                tag = build.distro_arch_series.architecturetag
                 self.logger.debug(
                     "Creating buildqueue record for %s (%s) on %s"
                     % (name, version, tag))
@@ -195,7 +195,7 @@
         for job in candidates:
             uptodate_build = getUtility(
                 IBinaryPackageBuildSet).getByQueueEntry(job)
-            if uptodate_build.buildstate != BuildStatus.NEEDSBUILD:
+            if uptodate_build.status != BuildStatus.NEEDSBUILD:
                 continue
             job.score()
 

=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
--- lib/lp/soyuz/scripts/packagecopier.py	2010-05-15 17:43:59 +0000
+++ lib/lp/soyuz/scripts/packagecopier.py	2010-05-27 13:26:53 +0000
@@ -110,7 +110,7 @@
         package_upload = build.package_upload
         package_files.append((package_upload, 'changesfile'))
         # Re-upload the buildlog file as necessary.
-        package_files.append((build, 'buildlog'))
+        package_files.append((build, 'log'))
     elif IPackageUploadCustom.providedBy(pub_record):
         # Re-upload the custom files included
         package_files.append((pub_record, 'libraryfilealias'))
@@ -341,7 +341,7 @@
             if not copied_binaries.issuperset(published_binaries):
                 raise CannotCopy(
                     "binaries conflicting with the existing ones")
-        self._checkConflictingFiles(source)    
+        self._checkConflictingFiles(source)
 
     def _checkConflictingFiles(self, source):
         # If both the source and destination archive are the same, we don't
@@ -350,7 +350,7 @@
         if source.archive.id == self.archive.id:
             return None
         source_files = [
-            sprf.libraryfile.filename for sprf in 
+            sprf.libraryfile.filename for sprf in
             source.sourcepackagerelease.files]
         destination_sha1s = self.archive.getFilesAndSha1s(source_files)
         for lf in source.sourcepackagerelease.files:
@@ -624,7 +624,7 @@
     # If binaries are included in the copy we include binary custom files.
     if include_binaries:
         for build in source.getBuilds():
-            if build.buildstate != BuildStatus.FULLYBUILT:
+            if build.status != BuildStatus.FULLYBUILT:
                 continue
             delayed_copy.addBuild(build)
             original_build_upload = build.package_upload

=== modified file 'lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py'
--- lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py	2010-04-12 08:29:02 +0000
+++ lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py	2010-05-27 13:26:53 +0000
@@ -15,9 +15,13 @@
 
 from canonical.config import config
 from canonical.launchpad.scripts.logger import QuietFakeLogger
+from canonical.launchpad.webapp.interfaces import (
+    IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 from canonical.testing import (
     DatabaseLayer, LaunchpadLayer, LaunchpadZopelessLayer)
 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.distribution import IDistributionSet
 from lp.services.scripts.base import LaunchpadScriptFailure
 from lp.soyuz.interfaces.component import IComponentSet
@@ -228,7 +232,13 @@
         self.number_of_pending_builds = self.getPendingBuilds().count()
 
     def getPendingBuilds(self):
-        return BinaryPackageBuild.selectBy(buildstate=BuildStatus.NEEDSBUILD)
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        pending_builds = store.find(
+            BinaryPackageBuild,
+            BinaryPackageBuild.package_build == PackageBuild.id,
+            PackageBuild.build_farm_job == BuildFarmJob.id,
+            BuildFarmJob.status == BuildStatus.NEEDSBUILD)
+        return pending_builds
 
     def getRetryDepwait(self, distribution=None):
         test_args = ['-n']
@@ -278,7 +288,7 @@
 
         # Make it dependend on the only binary that can be satisfied in
         # the sampledata.
-        depwait_build.dependencies = 'pmount'
+        depwait_build.dependencies = u'pmount'
 
         self.layer.commit()
 
@@ -291,7 +301,7 @@
         self.assertEqual(
             self.number_of_pending_builds + 1,
             self.getPendingBuilds().count())
-        self.assertEqual(depwait_build.buildstate.name, 'NEEDSBUILD')
+        self.assertEqual(depwait_build.status.name, 'NEEDSBUILD')
         self.assertEqual(depwait_build.buildqueue_record.lastscore, 1755)
 
 

=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-05-15 17:43:59 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-05-27 13:26:53 +0000
@@ -305,8 +305,8 @@
             'Privacy mismatch on %s' % build.upload_changesfile.filename)
         n_files += 1
         self.assertEquals(
-            build.buildlog.restricted, restricted,
-            'Privacy mismatch on %s' % build.buildlog.filename)
+            build.log.restricted, restricted,
+            'Privacy mismatch on %s' % build.log.filename)
         n_files += 1
         self.assertEquals(
             n_files, expected_n_files,
@@ -322,7 +322,7 @@
         # update_files_privacy() called on a private binary
         # publication that was copied to a public location correctly
         # makes all its related files (deb file, upload changesfile
-        # and buildlog) public.
+        # and log) public.
 
         # Create a new private PPA and a private source publication.
         private_source = self.makeSource(private=True)
@@ -491,7 +491,7 @@
 
     def test_cannot_copy_binaries_from_FTBFS(self):
         [build] = self.source.createMissingBuilds()
-        build.buildstate = BuildStatus.FAILEDTOBUILD
+        build.status = BuildStatus.FAILEDTOBUILD
         self.assertCannotCopyBinaries(
             'source has no binaries to be copied')
 
@@ -501,7 +501,7 @@
         # retried anytime, but they will fail-to-upload if a copy
         # has built successfully.
         [build] = self.source.createMissingBuilds()
-        build.buildstate = BuildStatus.FAILEDTOBUILD
+        build.status = BuildStatus.FAILEDTOBUILD
         self.assertCanCopySourceOnly()
 
     def test_cannot_copy_binaries_from_binaries_pending_publication(self):
@@ -1156,7 +1156,7 @@
         changes_file_name = '%s_%s_%s.changes' % (
             lazy_bin.name, lazy_bin.version, build_i386.arch_tag)
         package_upload = self.test_publisher.addPackageUpload(
-            ppa, build_i386.distroarchseries.distroseries,
+            ppa, build_i386.distro_arch_series.distroseries,
             build_i386.pocket, changes_file_content='anything',
             changes_file_name=changes_file_name)
         package_upload.addBuild(build_i386)
@@ -1862,8 +1862,8 @@
             status=PackagePublishingStatus.PUBLISHED)
 
         # The i386 build is completed and the hppa one pending.
-        self.assertEqual(build_hppa.buildstate, BuildStatus.NEEDSBUILD)
-        self.assertEqual(build_i386.buildstate, BuildStatus.FULLYBUILT)
+        self.assertEqual(build_hppa.status, BuildStatus.NEEDSBUILD)
+        self.assertEqual(build_i386.status, BuildStatus.FULLYBUILT)
 
         # Commit to ensure librarian files are written.
         self.layer.txn.commit()
@@ -2249,7 +2249,7 @@
             'foo_source.buildlog', restricted=True)
 
         for build in ppa_source.getBuilds():
-            build.buildlog = fake_buildlog
+            build.log = fake_buildlog
 
         # Create ancestry environment in the primary archive, so we can
         # test unembargoed overrides.
@@ -2312,7 +2312,7 @@
                 # Check build's upload changesfile
                 self.assertFalse(build.upload_changesfile.restricted)
                 # Check build's buildlog.
-                self.assertFalse(build.buildlog.restricted)
+                self.assertFalse(build.log.restricted)
             # Check that the pocket is -security as specified in the
             # script parameters.
             self.assertEqual(

=== modified file 'lib/lp/soyuz/scripts/tests/test_populatearchive.py'
--- lib/lp/soyuz/scripts/tests/test_populatearchive.py	2010-04-09 15:46:09 +0000
+++ lib/lp/soyuz/scripts/tests/test_populatearchive.py	2010-05-27 13:26:53 +0000
@@ -655,7 +655,7 @@
         def build_in_wrong_state(build):
             """True if the given build is not (pending and suspended)."""
             return not (
-                build.buildstate == BuildStatus.NEEDSBUILD and
+                build.status == BuildStatus.NEEDSBUILD and
                 build.buildqueue_record.job.status == JobStatus.SUSPENDED)
         hoary = getUtility(IDistributionSet)['ubuntu']['hoary']