Merge lp:~michael.nelson/launchpad/567922-binarypackagebuild-new-table-8 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**: The MP correctly mentions conflicts with db-devel but these shouldn't be in the displayed diff (against the previous branch). Some conflicts are due to a reversion of some work that was in db-devel and that I'd already pumped through the pipeline, and I'm waiting for that work to land again on db-devel before re-merging and pumping.

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

This branch just ensures that the code, registry and translation tests continue to pass. It's mostly mechanical, although there is some SQL which was updated in a previous branch, but was apparently only tested in the translations code :/

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 code.tests -m translations.tests -m registry.tests -m archiveuploader.tests -m archivepublisher.tests

[Graham Binns (gmb)]

review: Approve

=== modified file 'database/schema/pending/michaeln-build-generalisation.sql'
--- database/schema/pending/michaeln-build-generalisation.sql	2010-05-18 14:07:01 +0000
+++ database/schema/pending/michaeln-build-generalisation.sql	2010-05-18 14:07:27 +0000
@@ -179,10 +179,8 @@
 
 
 -- Step 4
--- Note, to enable parallel development getting the codebase updated, we will
--- uncomment the following deletion of the build table once the code has been
--- updated.
--- ALTER TABLE Build SET SCHEMA todrop;
+-- Drop the old Build table.
+ALTER TABLE Build SET SCHEMA todrop;
 
 -- Step 5
 -- Update views that reference the build table:

=== modified file 'lib/lp/archivepublisher/domination.py'
--- lib/lp/archivepublisher/domination.py	2009-11-15 19:52:54 +0000
+++ lib/lp/archivepublisher/domination.py	2010-05-18 14:07:27 +0000
@@ -203,13 +203,13 @@
             return
 
         dominant_build = dominant.binarypackagerelease.build
-        distroarchseries = dominant_build.distroarchseries
+        distroarchseries = dominant_build.distro_arch_series
         self.debug(
             "The %s build of %s has been judged as superseded by the build "
             "of %s.  Arch-specific == %s" % (
             distroarchseries.architecturetag,
             dominated.binarypackagerelease.title,
-            dominant.binarypackagerelease.build.sourcepackagerelease.title,
+            dominant.binarypackagerelease.build.source_package_release.title,
             dominated.binarypackagerelease.architecturespecific))
         dominated.status = SUPERSEDED
         dominated.datesuperseded = UTC_NOW
@@ -362,15 +362,16 @@
                 distroarchseries.id AND
             binarypackagepublishinghistory.scheduleddeletiondate IS NULL AND
             binarypackagepublishinghistory.archive = %s AND
-            build.sourcepackagerelease = %s AND
+            binarypackagebuild.source_package_release = %s AND
             distroarchseries.distroseries = %s AND
             binarypackagepublishinghistory.binarypackagerelease =
             binarypackagerelease.id AND
-            binarypackagerelease.build = build.id AND
+            binarypackagerelease.build = binarypackagebuild.id AND
             binarypackagepublishinghistory.pocket = %s
             """ % sqlvalues(self.archive, srcpkg_release,
                             pub_record.distroseries, pub_record.pocket),
-            clauseTables=['DistroArchSeries', 'BinaryPackageRelease','Build'])
+            clauseTables=['DistroArchSeries', 'BinaryPackageRelease',
+                          'BinaryPackageBuild'])
 
             # There is at least one non-removed binary to consider
             if considered_binaries.count() > 0:

=== modified file 'lib/lp/archiveuploader/tests/test_buildduploads.py'
--- lib/lp/archiveuploader/tests/test_buildduploads.py	2010-05-04 15:38:08 +0000
+++ lib/lp/archiveuploader/tests/test_buildduploads.py	2010-05-18 14:07:27 +0000
@@ -107,7 +107,7 @@
         self.assertEqual(
             u'i386 build of foo 1.0-1 in ubuntu breezy RELEASE',
             build_used.title)
-        self.assertEqual('FULLYBUILT', build_used.buildstate.name)
+        self.assertEqual('FULLYBUILT', build_used.status.name)
 
         # Force immediate publication.
         queue_item = self.uploadprocessor.last_processed_upload.queue_root
@@ -123,7 +123,7 @@
         self.assertEqual(
             u'powerpc build of foo 1.0-1 in ubuntu breezy RELEASE',
             build_used.title)
-        self.assertEqual('FULLYBUILT', build_used.buildstate.name)
+        self.assertEqual('FULLYBUILT', build_used.status.name)
 
 
 def test_suite():

=== modified file 'lib/lp/archiveuploader/tests/test_ppauploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2010-05-04 15:38:08 +0000
+++ lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2010-05-18 14:07:27 +0000
@@ -214,7 +214,7 @@
         [build] = builds
         self.assertEqual(
             build.title, 'i386 build of bar 1.0-1 in ubuntu breezy RELEASE')
-        self.assertEqual(build.buildstate.name, 'NEEDSBUILD')
+        self.assertEqual(build.status.name, 'NEEDSBUILD')
         self.assertTrue(build.buildqueue_record.lastscore is not 0)
 
         #
@@ -241,7 +241,7 @@
         [build, build_old] = builds
         self.assertEqual(
             build.title, 'i386 build of bar 1.0-10 in ubuntu breezy RELEASE')
-        self.assertEqual(build.buildstate.name, 'NEEDSBUILD')
+        self.assertEqual(build.status.name, 'NEEDSBUILD')
         self.assertTrue(build.buildqueue_record.lastscore is not 0)
 
         #
@@ -391,7 +391,7 @@
         [build] = builds
         self.assertEqual(
             build.title, 'i386 build of bar 1.0-1 in ubuntu breezy RELEASE')
-        self.assertEqual(build.buildstate.name, 'NEEDSBUILD')
+        self.assertEqual(build.status.name, 'NEEDSBUILD')
         self.assertTrue(build.buildqueue_record.lastscore is not 0)
 
         # Binary upload to the just-created build record.
@@ -575,7 +575,7 @@
         [build] = builds
         self.assertEqual(
             build.title, 'i386 build of bar 1.0-1 in ubuntu breezy RELEASE')
-        self.assertEqual(build.buildstate.name, 'NEEDSBUILD')
+        self.assertEqual(build.status.name, 'NEEDSBUILD')
         self.assertTrue(build.buildqueue_record.lastscore is not 0)
 
     def testNotMemberUploadToTeamPPA(self):

=== modified file 'lib/lp/archiveuploader/tests/test_securityuploads.py'
--- lib/lp/archiveuploader/tests/test_securityuploads.py	2010-05-04 15:38:08 +0000
+++ lib/lp/archiveuploader/tests/test_securityuploads.py	2010-05-18 14:07:27 +0000
@@ -131,7 +131,7 @@
         """Create a build record attached to the base source."""
         spr = self.source_queue.sources[0].sourcepackagerelease
         build = spr.createBuild(
-            distroarchseries=self.distroseries[archtag],
+            distro_arch_series=self.distroseries[archtag],
             pocket=self.pocket, archive=self.distroseries.main_archive)
         self.layer.txn.commit()
         return build
@@ -187,7 +187,7 @@
         self.assertEqual(
             u'i386 build of baz 1.0-1 in ubuntu warty SECURITY',
             build_used.title)
-        self.assertEqual('FULLYBUILT', build_used.buildstate.name)
+        self.assertEqual('FULLYBUILT', build_used.status.name)
 
         build_used = self._uploadBinary('amd64')
 
@@ -196,7 +196,7 @@
             u'amd64 build of baz 1.0-1 in ubuntu warty SECURITY',
             build_used.title)
 
-        self.assertEqual('FULLYBUILT', build_used.buildstate.name)
+        self.assertEqual('FULLYBUILT', build_used.status.name)
 
     def testBuildLookup(self):
         """Check if an available build gets used when it is appropriate.
@@ -219,7 +219,7 @@
         self.assertEqual(
             u'i386 build of baz 1.0-1 in ubuntu warty SECURITY',
             build_used.title)
-        self.assertEqual('FULLYBUILT', build_used.buildstate.name)
+        self.assertEqual('FULLYBUILT', build_used.status.name)
 
     def testCorrectBuildPassedViaCommandLine(self):
         """Check if command-line build argument gets attached correctly.
@@ -244,7 +244,7 @@
             u'i386 build of baz 1.0-1 in ubuntu warty SECURITY',
             build_used.title)
 
-        self.assertEqual('FULLYBUILT', build_used.buildstate.name)
+        self.assertEqual('FULLYBUILT', build_used.status.name)
 
     def testWrongBuildPassedViaCommandLine(self):
         """Check if a misapplied passed buildid is correctly identified.

=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_uploadprocessor.py	2010-05-04 15:38:08 +0000
+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py	2010-05-18 14:07:27 +0000
@@ -1014,7 +1014,7 @@
         self.assertEqual(
             build.title,
             'i386 build of foocomm 1.0-2 in ubuntu breezy RELEASE')
-        self.assertEqual(build.buildstate.name, 'NEEDSBUILD')
+        self.assertEqual(build.status.name, 'NEEDSBUILD')
         self.assertTrue(build.buildqueue_record.lastscore is not None)
 
         # Upload the next binary version of the package.

=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
--- lib/lp/buildmaster/model/buildfarmjob.py	2010-05-18 14:07:01 +0000
+++ lib/lp/buildmaster/model/buildfarmjob.py	2010-05-18 14:07:27 +0000
@@ -86,7 +86,7 @@
     @staticmethod
     def postprocessCandidate(job, logger):
         """See `IBuildFarmJobOld`."""
-        return True
+        raise NotImplementedError
 
     def cleanUp(self):
         """See `IBuildFarmJob`."""
@@ -161,6 +161,11 @@
         """See `IBuildFarmJobOld`."""
         return ('')
 
+    @staticmethod
+    def postprocessCandidate(job, logger):
+        """See `IBuildFarmJobOld`."""
+        return True
+
 
 class BuildFarmJob(BuildFarmJobOld, Storm):
     """A base implementation for `IBuildFarmJob` classes."""

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipebuild.py'
--- lib/lp/code/interfaces/sourcepackagerecipebuild.py	2010-05-06 18:34:20 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipebuild.py	2010-05-18 14:07:27 +0000
@@ -47,6 +47,10 @@
     distroseries = Reference(
         IDistroSeries, title=_("The distroseries being built for"),
         readonly=True)
+    # XXX michaeln 2010-05-18 bug=567922
+    # Temporarily alias distro_series until SPRecipeBuild is
+    # implementing IPackageBuild.
+    distro_series = distroseries
 
     sourcepackagename = Reference(
         ISourcePackageName,

=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/code/model/sourcepackagerecipebuild.py	2010-05-18 14:07:01 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py	2010-05-18 14:07:27 +0000
@@ -112,6 +112,7 @@
 
     distroseries_id = Int(name='distroseries', allow_none=True)
     distroseries = Reference(distroseries_id, 'DistroSeries.id')
+    distro_series = distroseries
 
     sourcepackagename_id = Int(name='sourcepackagename', allow_none=True)
     sourcepackagename = Reference(

=== modified file 'lib/lp/registry/doc/distroseries.txt'
--- lib/lp/registry/doc/distroseries.txt	2010-04-12 08:33:47 +0000
+++ lib/lp/registry/doc/distroseries.txt	2010-05-18 14:07:27 +0000
@@ -365,7 +365,7 @@
    2
 
    >>> for bin in bumpy_firefox_sp.currentrelease.binaries:
-   ...     print bin.id, bin.title, bin.build.distroarchseries.title
+   ...     print bin.id, bin.title, bin.build.distro_arch_series.title
    27 mozilla-firefox-data-0.9 The Warty Warthog Release for i386 (x86)
    12 mozilla-firefox-0.9 The Warty Warthog Release for i386 (x86)
 

=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py	2010-04-22 08:47:32 +0000
+++ lib/lp/registry/model/distroseries.py	2010-05-18 14:07:27 +0000
@@ -1044,8 +1044,8 @@
         BinaryPackageRelease.binarypackagename =
             BinaryPackageName.id AND
         BinaryPackageRelease.build =
-            Build.id AND
-        Build.sourcepackagerelease =
+            BinaryPackageBuild.id AND
+        BinaryPackageBuild.source_package_release =
             SourcePackageRelease.id AND
         SourcePackageRelease.sourcepackagename =
             SourcePackageName.id AND
@@ -1082,8 +1082,9 @@
         query = " AND ".join(query)
 
         clauseTables = ['BinaryPackagePublishingHistory', 'DistroArchSeries',
-                        'BinaryPackageRelease', 'BinaryPackageName', 'Build',
-                        'SourcePackageRelease', 'SourcePackageName']
+                        'BinaryPackageRelease', 'BinaryPackageName',
+                        'BinaryPackageBuild', 'SourcePackageRelease',
+                        'SourcePackageName']
 
         result = BinaryPackagePublishingHistory.select(
             query, distinct=False, clauseTables=clauseTables, orderBy=orderBy)

=== modified file 'lib/lp/soyuz/model/buildpackagejob.py'
--- lib/lp/soyuz/model/buildpackagejob.py	2010-05-18 14:07:01 +0000
+++ lib/lp/soyuz/model/buildpackagejob.py	2010-05-18 14:07:27 +0000
@@ -232,15 +232,15 @@
             sub_query += """
                 AND EXISTS (SELECT true
                 WHERE ((
-                    SELECT COUNT(build2.id)
+                    SELECT COUNT(binarypackagebuild2.id)
                     FROM BinaryPackageBuild binarypackagebuild2,
-                         PackageBuild packagebuild2
-                         BuildFarmJob buildfarmjob2
+                         PackageBuild packagebuild2,
+                         BuildFarmJob buildfarmjob2,
                          DistroArchSeries distroarchseries2
                     WHERE
                         binarypackagebuild2.package_build =
                             packagebuild2.id AND
-                        packagebuild2.archive = binarypackagebuild.archive AND
+                        packagebuild2.archive = packagebuild.archive AND
                         archive.purpose = %s AND
                         archive.private IS FALSE AND
                         binarypackagebuild2.distro_arch_series =