Merge lp:~jml/launchpad/more-recipe-model-code into lp:launchpad/db-devel

[Jonathan Lange]

[Jonathan Lange (jml)]

This branch adds model code for the SourcePackageBuild table. That's pretty much it.

=== modified file '.bzrignore'
--- .bzrignore	2010-01-10 22:23:32 +0000
+++ .bzrignore	2010-01-12 04:22:16 +0000
@@ -54,3 +54,4 @@
 _trial_temp
 lazr-js
 lib/canonical/buildd/launchpad-files
+.testrepository

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-01-12 04:22:13 +0000
+++ database/schema/security.cfg	2010-01-12 04:22:16 +0000
@@ -275,6 +275,7 @@
 public.sourcepackagepublishinghistory   = SELECT
 public.seriessourcepackagebranch        = SELECT, INSERT, UPDATE, DELETE
 public.sourcepackageformatselection     = SELECT
+public.sourcepackagebuild               = SELECT, INSERT, UPDATE, DELETE
 public.sourcepackagerecipe              = SELECT, INSERT, UPDATE, DELETE
 public.sourcepackagerecipedata          = SELECT, INSERT, UPDATE, DELETE
 public.sourcepackagerecipedatainstruction = SELECT, INSERT, UPDATE, DELETE

=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2010-01-12 04:22:13 +0000
+++ lib/lp/soyuz/configure.zcml	2010-01-12 04:22:16 +0000
@@ -945,4 +945,15 @@
       <allow interface="lp.soyuz.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource"/>
     </securedutility>
 
+    <class
+       class="lp.soyuz.model.sourcepackagebuild.SourcePackageBuild">
+      <allow interface="lp.soyuz.interfaces.sourcepackagebuild.ISourcePackageBuild"/>
+    </class>
+
+    <securedutility
+       component="lp.soyuz.model.sourcepackagebuild.SourcePackageBuild"
+       provides="lp.soyuz.interfaces.sourcepackagebuild.ISourcePackageBuildSource">
+      <allow interface="lp.soyuz.interfaces.sourcepackagebuild.ISourcePackageBuildSource"/>
+    </securedutility>
+
 </configure>

=== modified file 'lib/lp/soyuz/interfaces/build.py'
--- lib/lp/soyuz/interfaces/build.py	2009-11-20 18:06:28 +0000
+++ lib/lp/soyuz/interfaces/build.py	2010-01-12 04:22:16 +0000
@@ -201,6 +201,7 @@
         description=_("Build duration interval, calculated when the "
                       "build result gets collected."))
 
+    # XXX: jml 2010-01-12: Rename to build_log.
     buildlog = Object(
         schema=ILibraryFileAlias, required=False,
         title=_("The LibraryFileAlias containing the entire buildlog."))

=== added file 'lib/lp/soyuz/interfaces/sourcepackagebuild.py'
--- lib/lp/soyuz/interfaces/sourcepackagebuild.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/interfaces/sourcepackagebuild.py	2010-01-12 04:22:16 +0000
@@ -0,0 +1,94 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Interfaces for source package builds."""
+
+__metaclass__ = type
+__all__ = [
+    'ISourcePackageBuild',
+    'ISourcePackageBuildSource',
+    ]
+
+from lazr.restful.fields import Reference
+
+from zope.interface import Attribute, Interface
+from zope.schema import Choice, Datetime, Object, Timedelta
+
+from canonical.launchpad import _
+from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
+
+from lp.registry.interfaces.person import IPerson
+from lp.registry.interfaces.distroseries import IDistroSeries
+from lp.registry.interfaces.sourcepackagename import ISourcePackageName
+from lp.soyuz.interfaces.build import BuildStatus
+from lp.soyuz.interfaces.builder import IBuilder
+from lp.soyuz.interfaces.sourcepackagerecipe import ISourcePackageRecipe
+
+
+class ISourcePackageBuild(Interface):
+    """A build of a source package."""
+
+    date_created = Datetime(required=True, readonly=True)
+
+    distroseries = Reference(
+        IDistroSeries, title=_("The distroseries being built for"),
+        readonly=True)
+
+    sourcepackagename = Reference(
+        ISourcePackageName,
+        title=_("The name of the source package being built"),
+        readonly=True)
+
+    # XXX: JonathanLange 2010-01-12: Move build_state, date_built,
+    # build_duration, build_log, builder and maybe date_first_dispatched to a
+    # separate base interface shared by this and IBuild. Additionally, change
+    # IBuild to IBinaryPackageBuild.
+    build_state = Choice(
+        title=_('State'), required=True, vocabulary=BuildStatus,
+        description=_("The current build state."))
+
+    date_built = Datetime(required=False)
+
+    build_duration = Timedelta(
+        title=_("Build Duration"), required=False,
+        description=_("Build duration interval, calculated when the "
+                      "build result gets collected."))
+
+    build_log = Object(
+        schema=ILibraryFileAlias, required=False,
+        title=_("The LibraryFileAlias containing the entire build log."))
+
+    builder = Object(
+        title=_("Builder"), schema=IBuilder, required=False,
+        description=_("The builder handling this build request."))
+
+    date_first_dispatched = Datetime(
+        title=_('Date first dispatched'), required=False,
+        description=_("The actual build start time. Set when the build "
+                      "is dispatched the first time and not changed in "
+                      "subsequent build attempts."))
+
+    requester = Object(
+        schema=IPerson, required=False,
+        title=_("The person who wants this to be done."))
+
+    recipe = Object(
+        schema=ISourcePackageRecipe, required=True,
+        title=_("The recipe being built."))
+
+    manifest = Attribute(_("The manifest of the built package."))
+
+
+class ISourcePackageBuildSource(Interface):
+    """A utility of this interface be used to create source package builds."""
+
+    def new(sourcepackage, recipe, requester, date_created=None):
+        """Create an `ISourcePackageBuild`.
+
+        :param sourcepackage: The `ISourcePackage` that this is building.
+        :param recipe: The `ISourcePackageRecipe` that this is building.
+        :param requester: The `IPerson` who wants to build it.
+        :param date_created: The date this build record was created. If not
+            provided, defaults to now.
+        :return: `ISourcePackageBuild`.
+        """

=== modified file 'lib/lp/soyuz/interfaces/sourcepackagerecipe.py'
--- lib/lp/soyuz/interfaces/sourcepackagerecipe.py	2010-01-12 04:22:13 +0000
+++ lib/lp/soyuz/interfaces/sourcepackagerecipe.py	2010-01-12 04:22:16 +0000
@@ -14,7 +14,6 @@
 from lazr.restful.fields import Reference
 
 from zope.interface import Interface
-
 from zope.schema import Datetime, Text, TextLine
 
 from canonical.launchpad import _

=== added file 'lib/lp/soyuz/model/sourcepackagebuild.py'
--- lib/lp/soyuz/model/sourcepackagebuild.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/model/sourcepackagebuild.py	2010-01-12 04:22:16 +0000
@@ -0,0 +1,97 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Implementation code for source package builds."""
+
+__metaclass__ = type
+__all__ = [
+    'SourcePackageBuild',
+    ]
+
+from canonical.database.constants import UTC_NOW
+from canonical.database.datetimecol import UtcDateTimeCol
+from canonical.database.enumcol import EnumCol
+from canonical.launchpad.interfaces.lpstorm import IMasterStore
+
+from storm.locals import Int, Reference, Storm, TimeDelta
+
+from zope.interface import classProvides, implements
+
+from lp.soyuz.interfaces.build import BuildStatus
+from lp.soyuz.interfaces.sourcepackagebuild import (
+    ISourcePackageBuild, ISourcePackageBuildSource)
+
+
+class SourcePackageBuild(Storm):
+
+    __storm_table__ = 'SourcePackageBuild'
+
+    implements(ISourcePackageBuild)
+    classProvides(ISourcePackageBuildSource)
+
+    id = Int(primary=True)
+
+    build_duration = TimeDelta(name='build_duration', default=None)
+
+    builder_id = Int(name='builder', allow_none=True)
+    builder = Reference(builder_id, 'Builder.id')
+
+    build_log_id = Int(name='build_log', allow_none=True)
+    build_log = Reference(build_log_id, 'LibraryFileAlias.id')
+
+    build_state = EnumCol(
+        dbName='build_state', notNull=True, schema=BuildStatus)
+
+    date_created = UtcDateTimeCol(notNull=True)
+    date_built = UtcDateTimeCol(notNull=False)
+    date_first_dispatched = UtcDateTimeCol(notNull=False)
+
+    distroseries_id = Int(name='distroseries', allow_none=True)
+    distroseries = Reference(distroseries_id, 'DistroSeries.id')
+
+    sourcepackagename_id = Int(name='sourcepackagename', allow_none=True)
+    sourcepackagename = Reference(sourcepackagename_id, 'SourcePackageName.id')
+
+    recipe_id = Int(name='recipe', allow_none=False)
+    recipe = Reference(recipe_id, 'SourcePackageRecipe.id')
+
+    requester_id = Int(name='requester', allow_none=False)
+    requester = Reference(requester_id, 'Person.id')
+
+    manifest_id = Int(name='manifest', allow_none=True)
+    manifest = Reference(manifest_id, '_SourcePackageRecipeData.id')
+
+    def __init__(self, distroseries, sourcepackagename, recipe, requester,
+                 date_created=None, date_first_dispatched=None,
+                 date_built=None, manifest=None, builder=None,
+                 build_state=BuildStatus.NEEDSBUILD, build_log=None,
+                 build_duration=None):
+        """Construct a SourcePackageBuild."""
+        super(SourcePackageBuild, self).__init__()
+        self.build_duration = build_duration
+        self.build_log = build_log
+        self.builder = builder
+        self.build_state = build_state
+        self.date_built = date_built
+        self.date_created = date_created
+        self.date_first_dispatched = date_first_dispatched
+        self.distroseries = distroseries
+        self.manifest = manifest
+        self.recipe = recipe
+        self.requester = requester
+        self.sourcepackagename = sourcepackagename
+
+    @classmethod
+    def new(cls, sourcepackage, recipe, requester, date_created=None):
+        """See `ISourcePackageBuildSource`."""
+        store = IMasterStore(SourcePackageBuild)
+        if date_created is None:
+            date_created = UTC_NOW
+        spbuild = cls(
+            sourcepackage.distroseries,
+            sourcepackage.sourcepackagename,
+            recipe,
+            requester,
+            date_created=date_created)
+        store.add(spbuild)
+        return spbuild

=== modified file 'lib/lp/soyuz/model/sourcepackagerecipe.py'
--- lib/lp/soyuz/model/sourcepackagerecipe.py	2010-01-12 04:22:13 +0000
+++ lib/lp/soyuz/model/sourcepackagerecipe.py	2010-01-12 04:22:16 +0000
@@ -4,7 +4,9 @@
 """Implementation of the `SourcePackageRecipe` content type."""
 
 __metaclass__ = type
-__all__ = ['SourcePackageRecipe']
+__all__ = [
+    'SourcePackageRecipe',
+    ]
 
 from storm.locals import Int, Reference, Storm, Unicode
 

=== added file 'lib/lp/soyuz/tests/test_sourcepackagebuild.py'
--- lib/lp/soyuz/tests/test_sourcepackagebuild.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/tests/test_sourcepackagebuild.py	2010-01-12 04:22:16 +0000
@@ -0,0 +1,43 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for source package builds."""
+
+__metaclass__ = type
+
+import unittest
+
+import transaction
+from zope.component import getUtility
+
+from canonical.testing.layers import DatabaseFunctionalLayer
+
+from lp.soyuz.interfaces.sourcepackagebuild import (
+    ISourcePackageBuild, ISourcePackageBuildSource)
+from lp.testing import TestCaseWithFactory
+
+
+class TestSourcePackageBuild(TestCaseWithFactory):
+    """Test the source package build object."""
+
+    layer = DatabaseFunctionalLayer
+
+    def makeSourcePackageBuild(self):
+        return getUtility(ISourcePackageBuildSource).new(
+            sourcepackage=self.factory.makeSourcePackage(),
+            recipe=self.factory.makeSourcePackageRecipe(),
+            requester=self.factory.makePerson())
+
+    def test_providesInterface(self):
+        # SourcePackageBuild provides ISourcePackageBuild.
+        spb = self.makeSourcePackageBuild()
+        self.assertProvides(spb, ISourcePackageBuild)
+
+    def test_saves_record(self):
+        spb = self.makeSourcePackageBuild()
+        transaction.commit()
+        self.assertProvides(spb, ISourcePackageBuild)
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/soyuz/tests/test_sourcepackagerecipe.py'
--- lib/lp/soyuz/tests/test_sourcepackagerecipe.py	2010-01-12 04:22:13 +0000
+++ lib/lp/soyuz/tests/test_sourcepackagerecipe.py	2010-01-12 04:22:16 +0000
@@ -21,32 +21,11 @@
 from lp.testing import login_person, TestCaseWithFactory
 
 
-MINIMAL_RECIPE_TEXT = u'''\
-# bzr-builder format 0.2 deb-version 1.0
-%s
-'''
-
 class TestSourcePackageRecipe(TestCaseWithFactory):
     """Tests for `SourcePackageRecipe` objects."""
 
     layer = DatabaseFunctionalLayer
 
-    def makeBuilderRecipe(self, *branches):
-        """Make a builder recipe that references `branches`.
-
-        If no branches are passed, return a recipe text that references an
-        arbitrary branch.
-        """
-        if len(branches) == 0:
-            branches = (self.factory.makeAnyBranch(),)
-        base_branch = branches[0]
-        other_branches = branches[1:]
-        text = MINIMAL_RECIPE_TEXT % base_branch.bzr_identity
-        for i, branch in enumerate(other_branches):
-            text += 'merge dummy-%s %s\n' % (i, branch.bzr_identity)
-        parser = RecipeParser(text)
-        return parser.parse()
-
     def makeSourcePackageRecipeFromBuilderRecipe(self, builder_recipe):
         """Make a SourcePackageRecipe from `builder_recipe` and arbitrary other fields.
         """
@@ -68,7 +47,7 @@
         distroseries = self.factory.makeDistroSeries()
         sourcepackagename = self.factory.makeSourcePackageName()
         name = self.factory.getUniqueString(u'recipe-name')
-        builder_recipe = self.makeBuilderRecipe()
+        builder_recipe = self.factory.makeRecipe()
         recipe = getUtility(ISourcePackageRecipeSource).new(
             registrant=registrant, owner=owner, distroseries=distroseries,
             sourcepackagename=sourcepackagename, name=name,
@@ -87,14 +66,14 @@
     def test_recipe_implements_interface(self):
         # SourcePackageRecipe objects implement ISourcePackageRecipe.
         recipe = self.makeSourcePackageRecipeFromBuilderRecipe(
-            self.makeBuilderRecipe())
+            self.factory.makeRecipe())
         self.assertProvides(recipe, ISourcePackageRecipe)
 
     def test_branch_links_created(self):
         # When a recipe is created, we can query it for links to the branch
         # it references.
         branch = self.factory.makeAnyBranch()
-        builder_recipe = self.makeBuilderRecipe(branch)
+        builder_recipe = self.factory.makeRecipe(branch)
         sp_recipe = self.makeSourcePackageRecipeFromBuilderRecipe(
             builder_recipe)
         self.assertEquals([branch], list(sp_recipe.getReferencedBranches()))
@@ -104,7 +83,7 @@
         # returns all of them.
         branch1 = self.factory.makeAnyBranch()
         branch2 = self.factory.makeAnyBranch()
-        builder_recipe = self.makeBuilderRecipe(branch1, branch2)
+        builder_recipe = self.factory.makeRecipe(branch1, branch2)
         sp_recipe = self.makeSourcePackageRecipeFromBuilderRecipe(
             builder_recipe)
         self.assertEquals(
@@ -114,11 +93,11 @@
     def test_random_user_cant_edit(self):
         # An arbitrary user can't set attributes.
         branch1 = self.factory.makeAnyBranch()
-        builder_recipe1 = self.makeBuilderRecipe(branch1)
+        builder_recipe1 = self.factory.makeRecipe(branch1)
         sp_recipe = self.makeSourcePackageRecipeFromBuilderRecipe(
             builder_recipe1)
         branch2 = self.factory.makeAnyBranch()
-        builder_recipe2 = self.makeBuilderRecipe(branch2)
+        builder_recipe2 = self.factory.makeRecipe(branch2)
         login_person(self.factory.makePerson())
         self.assertRaises(
             Unauthorized, setattr, sp_recipe, 'builder_recipe',
@@ -128,11 +107,11 @@
         # When the recipe_text is replaced, getReferencedBranches returns
         # (only) the branches referenced by the new recipe.
         branch1 = self.factory.makeAnyBranch()
-        builder_recipe1 = self.makeBuilderRecipe(branch1)
+        builder_recipe1 = self.factory.makeRecipe(branch1)
         sp_recipe = self.makeSourcePackageRecipeFromBuilderRecipe(
             builder_recipe1)
         branch2 = self.factory.makeAnyBranch()
-        builder_recipe2 = self.makeBuilderRecipe(branch2)
+        builder_recipe2 = self.factory.makeRecipe(branch2)
         login_person(sp_recipe.owner.teamowner)
         #import pdb; pdb.set_trace()
         sp_recipe.builder_recipe = builder_recipe2
@@ -152,7 +131,7 @@
 
     def test_run_rejected_without_mangling_recipe(self):
         branch1 = self.factory.makeAnyBranch()
-        builder_recipe1 = self.makeBuilderRecipe(branch1)
+        builder_recipe1 = self.factory.makeRecipe(branch1)
         sp_recipe = self.makeSourcePackageRecipeFromBuilderRecipe(
             builder_recipe1)
         recipe_text = '''\
@@ -169,12 +148,13 @@
         self.assertEquals([branch1], list(sp_recipe.getReferencedBranches()))
 
     def test_reject_newer_formats(self):
-        builder_recipe = self.makeBuilderRecipe()
+        builder_recipe = self.factory.makeRecipe()
         builder_recipe.format = 0.3
         self.assertRaises(
             TooNewRecipeFormat,
             self.makeSourcePackageRecipeFromBuilderRecipe, builder_recipe)
 
+
 class TestRecipeBranchRoundTripping(TestCaseWithFactory):
 
     layer = DatabaseFunctionalLayer
@@ -364,7 +344,5 @@
             child_branch, "zam", self.merged_branch.bzr_identity, revspec="2")
 
 
-
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
-

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-01-05 00:53:47 +0000
+++ lib/lp/testing/factory.py	2010-01-12 04:22:16 +0000
@@ -22,6 +22,7 @@
 from itertools import count
 from StringIO import StringIO
 import os.path
+from textwrap import dedent
 
 import pytz
 from storm.store import Store
@@ -40,6 +41,7 @@
 from lp.soyuz.adapters.packagelocation import PackageLocation
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.interfaces.section import ISectionSet
+from lp.soyuz.interfaces.sourcepackagerecipe import ISourcePackageRecipeSource
 from canonical.launchpad.database.account import Account
 from canonical.launchpad.database.emailaddress import EmailAddress
 from canonical.launchpad.database.message import Message, MessageChunk
@@ -76,7 +78,7 @@
 from lp.translations.interfaces.translationgroup import (
     ITranslationGroupSet)
 from lp.translations.interfaces.translator import ITranslatorSet
-from lp.translations.interfaces.translationsperson import ITranslationsPerson 
+from lp.translations.interfaces.translationsperson import ITranslationsPerson
 from canonical.launchpad.ftests._sqlobject import syncUpdate
 from lp.services.mail.signedmessage import SignedMessage
 from lp.services.worlddata.interfaces.country import ICountrySet
@@ -225,6 +227,12 @@
     for any other required objects.
     """
 
+    # Used for makeBuilderRecipe.
+    MINIMAL_RECIPE_TEXT = dedent(u'''\
+        # bzr-builder format 0.2 deb-version 1.0
+        %s
+        ''')
+
     def makeCopyArchiveLocation(self, distribution=None, owner=None,
         name=None, enabled=True):
         """Create and return a new arbitrary location for copy packages."""
@@ -511,7 +519,8 @@
             group = self.makeTranslationGroup()
         if person is None:
             person = self.makePerson()
-        ITranslationsPerson(person).translations_relicensing_agreement = license
+        tx_person = ITranslationsPerson(person)
+        tx_person.translations_relicensing_agreement = license
         return getUtility(ITranslatorSet).new(group, language, person)
 
     def makeMilestone(
@@ -946,7 +955,7 @@
             author = self.getUniqueString('author')
         for index in range(count):
             revision = revision_set.new(
-                revision_id = self.getUniqueString('revision-id'),
+                revision_id=self.getUniqueString('revision-id'),
                 log_body=self.getUniqueString('log-body'),
                 revision_date=date_generator.next(),
                 revision_author=author,
@@ -1552,6 +1561,41 @@
             processor, url, name, title, description, owner, active,
             virtualized, vm_host)
 
+    def makeRecipe(self, *branches):
+        """Make a builder recipe that references `branches`.
+
+        If no branches are passed, return a recipe text that references an
+        arbitrary branch.
+        """
+        from bzrlib.plugins.builder.recipe import RecipeParser
+        if len(branches) == 0:
+            branches = (self.makeAnyBranch(),)
+        base_branch = branches[0]
+        other_branches = branches[1:]
+        text = self.MINIMAL_RECIPE_TEXT % base_branch.bzr_identity
+        for i, branch in enumerate(other_branches):
+            text += 'merge dummy-%s %s\n' % (i, branch.bzr_identity)
+        parser = RecipeParser(text)
+        return parser.parse()
+
+    def makeSourcePackageRecipe(self, registrant=None, owner=None,
+                                distroseries=None, sourcepackagename=None,
+                                name=None, *branches):
+        """Make a `SourcePackageRecipe`."""
+        if registrant is None:
+            registrant = self.makePerson()
+        if owner is None:
+            owner = self.makePerson()
+        if distroseries is None:
+            distroseries = self.makeDistroSeries()
+        if sourcepackagename is None:
+            sourcepackagename = self.makeSourcePackageName()
+        if name is None:
+            name = self.getUniqueString().decode('utf8')
+        recipe = self.makeRecipe(*branches)
+        return getUtility(ISourcePackageRecipeSource).new(
+            registrant, owner, distroseries, sourcepackagename, name, recipe)
+
     def makePOTemplate(self, productseries=None, distroseries=None,
                        sourcepackagename=None, owner=None, name=None,
                        translation_domain=None, path=None):

=== modified file 'standard_template.py'
--- standard_template.py	2010-01-01 04:02:51 +0000
+++ standard_template.py	2010-01-12 04:22:16 +0000
@@ -1,7 +1,7 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Module docstring goes here."""
+"""XXX: Module docstring goes here."""
 
 __metaclass__ = type
 __all__ = []

=== modified file 'standard_test_template.py'
--- standard_test_template.py	2010-01-01 04:02:51 +0000
+++ standard_test_template.py	2010-01-12 04:22:16 +0000
@@ -1,7 +1,7 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Module docstring goes here."""
+"""XXX: Module docstring goes here."""
 
 __metaclass__ = type
 
@@ -12,4 +12,3 @@
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
-