Merge lp:~abentley/launchpad/fix-recipebuilder into lp:launchpad

[Aaron Bentley]

Fix verifyBuildRequest to use valid attribute

= Summary =
Fix bug #581899: verifyBuildRequest is broken

== Proposed fix ==
Update to use SourcePackageRecipeBuild.is_virtualized, like binary builds do.

== Pre-implementation notes ==
Discussed with noodles and bigjools

== Implementation details ==
Make SourcePackageRecipeBuildJob.virtualized mirror
SourcePackageRecipeBuild.is_virtualized

Allow overriding the pocket of a Build.

Add tests for error paths in verifyBuildRequest

== Tests ==
bin/test -t verifyBuildRequest test_recipebuilder

== Demo and Q/A ==
I am unclear how to test this.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/code/interfaces/sourcepackagerecipebuild.py
  lib/lp/testing/factory.py
  lib/lp/code/model/sourcepackagerecipebuild.py
  lib/lp/code/model/tests/test_recipebuilder.py
  lib/lp/code/model/recipebuilder.py

[Paul Hummer (rockstar)]

review: Approve (code)

=== 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-25 19:21:34 +0000
@@ -17,7 +17,7 @@
 from lazr.restful.declarations import export_as_webservice_entry
 
 from zope.interface import Interface
-from zope.schema import Datetime, Int, Object
+from zope.schema import Bool, Datetime, Int, Object
 
 from canonical.launchpad import _
 
@@ -65,6 +65,8 @@
         ISourcePackageRelease, title=_("The produced source package release"),
         readonly=True)
 
+    is_virtualized = Bool(title=_('If True, this build is virtualized.'))
+
     def getFileByName(filename):
         """Return the file under +files with specified name."""
 

=== modified file 'lib/lp/code/model/recipebuilder.py'
--- lib/lp/code/model/recipebuilder.py	2010-05-10 15:50:23 +0000
+++ lib/lp/code/model/recipebuilder.py	2010-05-25 19:21:34 +0000
@@ -153,7 +153,7 @@
         """
         build = self.build
         assert not (not self._builder.virtualized and build.is_virtualized), (
-            "Attempt to build non-virtual item on a virtual builder.")
+            "Attempt to build virtual item on a non-virtual builder.")
 
         # This should already have been checked earlier, but just check again
         # here in case of programmer errors.

=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/code/model/sourcepackagerecipebuild.py	2010-05-14 21:24:48 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py	2010-05-25 19:21:34 +0000
@@ -119,6 +119,8 @@
         """See `IBuildBase`."""
         return self.distroseries.distribution
 
+    is_virtualized = True
+
     pocket = DBEnum(enum=PackagePublishingPocket)
 
     recipe_id = Int(name='recipe', allow_none=False)
@@ -169,11 +171,12 @@
         self.sourcepackagename = sourcepackagename
 
     @classmethod
-    def new(cls, sourcepackage, recipe, requester, archive,
-            pocket=PackagePublishingPocket.RELEASE,
+    def new(cls, sourcepackage, recipe, requester, archive, pocket=None,
             date_created=None):
         """See `ISourcePackageRecipeBuildSource`."""
         store = IMasterStore(SourcePackageRecipeBuild)
+        if pocket is None:
+            pocket = PackagePublishingPocket.RELEASE
         if date_created is None:
             date_created = UTC_NOW
         spbuild = cls(
@@ -255,7 +258,10 @@
     def processor(self):
         return self.build.distroseries.nominatedarchindep.default_processor
 
-    virtualized = True
+    @property
+    def virtualized(self):
+        """See `IBuildFarmJob`."""
+        return self.build.is_virtualized
 
     def __init__(self, build, job):
         self.build = build

=== modified file 'lib/lp/code/model/tests/test_recipebuilder.py'
--- lib/lp/code/model/tests/test_recipebuilder.py	2010-05-06 18:16:09 +0000
+++ lib/lp/code/model/tests/test_recipebuilder.py	2010-05-25 19:21:34 +0000
@@ -25,6 +25,7 @@
 from lp.code.model.recipebuilder import RecipeBuildBehavior
 from lp.code.model.sourcepackagerecipebuild import (
     SourcePackageRecipeBuild)
+from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.adapters.archivedependencies import (
     get_sources_list_for_building)
 from lp.soyuz.model.processor import ProcessorFamilySet
@@ -99,6 +100,28 @@
         job.verifyBuildRequest(logger)
         self.assertEquals("", logger.buffer.getvalue())
 
+    def test_verifyBuildRequest_non_virtual(self):
+        # verifyBuildRequest will raise if a non-virtual builder is proposed.
+        job = self.makeJob()
+        builder = MockBuilder('non-virtual builder', OkSlave())
+        builder.virtualized = False
+        job.setBuilder(builder)
+        logger = BufferLogger()
+        e = self.assertRaises(AssertionError, job.verifyBuildRequest, logger)
+        self.assertEqual(
+            'Attempt to build virtual item on a non-virtual builder.', str(e))
+
+    def test_verifyBuildRequest_bad_pocket(self):
+        # verifyBuildRequest will raise if a bad pocket is proposed.
+        build = self.factory.makeSourcePackageRecipeBuild(
+            pocket=PackagePublishingPocket.SECURITY)
+        job = self.factory.makeSourcePackageRecipeBuildJob(recipe_build=build)
+        job = IBuildFarmJobBehavior(job.specific_job)
+        job.setBuilder(MockBuilder("bob-de-bouwer", OkSlave()))
+        e = self.assertRaises(
+            AssertionError, job.verifyBuildRequest, BufferLogger())
+        self.assertIn('invalid pocket due to the series status of', str(e))
+
     def test__extraBuildArgs(self):
         # _extraBuildArgs will return a sane set of additional arguments
         bzr_builder_config = """

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-05-19 07:39:42 +0000
+++ lib/lp/testing/factory.py	2010-05-25 19:21:34 +0000
@@ -1789,7 +1789,8 @@
 
     def makeSourcePackageRecipeBuild(self, sourcepackage=None, recipe=None,
                                      requester=None, archive=None,
-                                     sourcename=None, distroseries=None):
+                                     sourcename=None, distroseries=None,
+                                     pocket=None):
         """Make a new SourcePackageRecipeBuild."""
         if recipe is None:
             recipe = self.makeSourcePackageRecipe(
@@ -1808,7 +1809,8 @@
             sourcepackage=sourcepackage,
             recipe=recipe,
             archive=archive,
-            requester=requester)
+            requester=requester,
+            pocket=pocket)
 
     def makeSourcePackageRecipeBuildJob(
         self, score=9876, virtualized=True, estimated_duration=64,