Merge lp:~rockstar/launchpad/spr-admin into lp:launchpad

[Paul Hummer]

This branch makes a link available on source package recipe builds that allows admins and bazaar experts to delete the build. Julian isn't really thrilled about this change, but we're still in beta, we need to be better at getting rid of broken builds, so, yeah, that's why we did this. Patch is (hopefully) pretty self explanatory.

[Paul Hummer (rockstar)]

Oh yeah, the other thing I did was to move lp.code.browser.sourcepackagerecipe stuff that was really sourcepackagerecipebuild stuff to lp.code.browser.sourcepackagerecipebuild.

[Aaron Bentley (abentley)]

Some minor formatting stuff to fix, as discussed.

review: Approve

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-07-13 10:57:31 +0000
+++ lib/canonical/launchpad/security.py	2010-07-16 13:31:52 +0000
@@ -1142,6 +1142,15 @@
     usedfor = ICodeImportMachine
 
 
+class DeleteSourcePackageRecipeBuilds(OnlyBazaarExpertsAndAdmins):
+    """Control who can delete SourcePackageRecipeBuilds.
+
+    Access is restricted to members of ~bazaar-experts and Launchpad admins.
+    """
+    permission = 'launchpad.Edit'
+    usedfor = ISourcePackageRecipeBuild
+
+
 class AdminDistributionTranslations(AuthorizationBase):
     """Class for deciding who can administer distribution translations.
 

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2010-07-09 10:22:32 +0000
+++ lib/lp/code/browser/configure.zcml	2010-07-16 13:31:52 +0000
@@ -1083,11 +1083,16 @@
         attribute_to_parent="recipe"
         path_expression="string:+build/${id}"
         rootsite="code" />
+    <browser:menus
+        classes="SourcePackageRecipeBuildContextMenu"
+        module="lp.code.browser.sourcepackagerecipebuild"/>
 
     <browser:navigation
         module="lp.code.browser.sourcepackagerecipe"
-        classes="SourcePackageRecipeNavigation
-        SourcePackageRecipeBuildNavigation" />
+        classes="SourcePackageRecipeNavigation" />
+    <browser:navigation
+        module="lp.code.browser.sourcepackagerecipebuild"
+        classes="SourcePackageRecipeBuildNavigation" />
 
     <facet facet="branches">
 
@@ -1115,10 +1120,16 @@
             layer="canonical.launchpad.layers.CodeLayer"/>
         <browser:page
             for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
-            class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeBuildView"
+            class="lp.code.browser.sourcepackagerecipebuild.SourcePackageRecipeBuildView"
             name="+index"
             template="../templates/sourcepackagerecipebuild-index.pt"
             permission="launchpad.View"/>
+        <browser:page
+            for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
+            class="lp.code.browser.sourcepackagerecipebuild.SourcePackageRecipeBuildCancelView"
+            name="+cancel"
+            template="../../app/templates/generic-edit.pt"
+            permission="launchpad.View"/>
         <browser:menus
             classes="
                 SourcePackageRecipeNavigationMenu

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2010-07-02 01:12:15 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2010-07-16 13:31:52 +0000
@@ -7,7 +7,6 @@
 
 __all__ = [
     'SourcePackageRecipeAddView',
-    'SourcePackageRecipeBuildView',
     'SourcePackageRecipeContextMenu',
     'SourcePackageRecipeEditView',
     'SourcePackageRecipeNavigationMenu',
@@ -29,7 +28,6 @@
 
 from canonical.database.constants import UTC_NOW
 from canonical.launchpad.browser.launchpad import Hierarchy
-from canonical.launchpad.browser.librarian import FileNavigationMixin
 from canonical.launchpad.interfaces import ILaunchBag
 from canonical.launchpad.webapp import (
     action, canonical_url, ContextMenu, custom_widget,
@@ -39,19 +37,18 @@
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.webapp.sorting import sorted_dotted_numbers
 from canonical.widgets.itemswidgets import LabeledMultiCheckBoxWidget
-from lp.buildmaster.interfaces.buildbase import BuildStatus
-from lp.code.errors import BuildAlreadyPending, ForbiddenInstruction
+from lp.code.errors import ForbiddenInstruction
+from lp.code.errors import BuildAlreadyPending
 from lp.code.interfaces.branch import NoSuchBranch
 from lp.code.interfaces.sourcepackagerecipe import (
     ISourcePackageRecipe, ISourcePackageRecipeSource, MINIMAL_RECIPE_TEXT)
 from lp.code.interfaces.sourcepackagerecipebuild import (
-    ISourcePackageRecipeBuild, ISourcePackageRecipeBuildSource)
+    ISourcePackageRecipeBuildSource)
 from lp.soyuz.browser.archive import make_archive_vocabulary
 from lp.soyuz.interfaces.archive import (
     IArchiveSet)
 from lp.registry.interfaces.distroseries import IDistroSeriesSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
-from lp.services.job.interfaces.job import JobStatus
 
 RECIPE_BETA_MESSAGE = structured(
     'We\'re still working on source package recipes. '
@@ -193,6 +190,7 @@
     terms.reverse()
     return SimpleVocabulary(terms)
 
+
 def target_ppas_vocabulary(context):
     """Return a vocabulary of ppas that the current user can target."""
     ppas = getUtility(IArchiveSet).getPPAsForUser(getUtility(ILaunchBag).user)
@@ -264,69 +262,6 @@
 
 
 
-class SourcePackageRecipeBuildNavigation(Navigation, FileNavigationMixin):
-
-    usedfor = ISourcePackageRecipeBuild
-
-
-class SourcePackageRecipeBuildView(LaunchpadView):
-    """Default view of a SourcePackageRecipeBuild."""
-
-    @property
-    def status(self):
-        """A human-friendly status string."""
-        if (self.context.buildstate == BuildStatus.NEEDSBUILD
-            and self.eta is None):
-            return 'No suitable builders'
-        return {
-            BuildStatus.NEEDSBUILD: 'Pending build',
-            BuildStatus.FULLYBUILT: 'Successful build',
-            BuildStatus.MANUALDEPWAIT: (
-                'Could not build because of missing dependencies'),
-            BuildStatus.CHROOTWAIT: (
-                'Could not build because of chroot problem'),
-            BuildStatus.SUPERSEDED: (
-                'Could not build because source package was superseded'),
-            BuildStatus.FAILEDTOUPLOAD: 'Could not be uploaded correctly',
-            }.get(self.context.buildstate, self.context.buildstate.title)
-
-    @property
-    def eta(self):
-        """The datetime when the build job is estimated to complete.
-
-        This is the BuildQueue.estimated_duration plus the
-        Job.date_started or BuildQueue.getEstimatedJobStartTime.
-        """
-        if self.context.buildqueue_record is None:
-            return None
-        queue_record = self.context.buildqueue_record
-        if queue_record.job.status == JobStatus.WAITING:
-            start_time = queue_record.getEstimatedJobStartTime()
-            if start_time is None:
-                return None
-        else:
-            start_time = queue_record.job.date_started
-        duration = queue_record.estimated_duration
-        return start_time + duration
-
-    @property
-    def date(self):
-        """The date when the build completed or is estimated to complete."""
-        if self.estimate:
-            return self.eta
-        return self.context.datebuilt
-
-    @property
-    def estimate(self):
-        """If true, the date value is an estimate."""
-        if self.context.datebuilt is not None:
-            return False
-        return self.eta is not None
-
-    def binary_builds(self):
-        return list(self.context.binary_builds)
-
-
 class ISourcePackageAddEditSchema(Interface):
     """Schema for adding or editing a recipe."""
 

=== added file 'lib/lp/code/browser/sourcepackagerecipebuild.py'
--- lib/lp/code/browser/sourcepackagerecipebuild.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/browser/sourcepackagerecipebuild.py	2010-07-16 13:31:52 +0000
@@ -0,0 +1,121 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""SourcePackageRecipeBuild views."""
+
+__metaclass__ = type
+
+__all__ = [
+    'SourcePackageRecipeBuildContextMenu',
+    'SourcePackageRecipeBuildNavigation',
+    'SourcePackageRecipeBuildView',
+    'SourcePackageRecipeBuildCancelView',
+    ]
+
+from zope.interface import Interface
+
+from canonical.launchpad.browser.librarian import FileNavigationMixin
+from canonical.launchpad.webapp import (
+    action, canonical_url, ContextMenu, enabled_with_permission,
+    LaunchpadView, LaunchpadFormView, Link, Navigation)
+
+from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.code.interfaces.sourcepackagerecipebuild import (
+    ISourcePackageRecipeBuild)
+from lp.services.job.interfaces.job import JobStatus
+
+
+class SourcePackageRecipeBuildNavigation(Navigation, FileNavigationMixin):
+
+    usedfor = ISourcePackageRecipeBuild
+
+
+class SourcePackageRecipeBuildContextMenu(ContextMenu):
+    """Navigation menu for sourcepackagerecipe build."""
+
+    usedfor = ISourcePackageRecipeBuild
+
+    facet = 'branches'
+
+    links = ('cancel',)
+
+    @enabled_with_permission('launchpad.Edit')
+    def cancel(self):
+        return Link('+cancel', 'Cancel build', icon='remove')
+
+
+class SourcePackageRecipeBuildView(LaunchpadView):
+    """Default view of a SourcePackageRecipeBuild."""
+
+    @property
+    def status(self):
+        """A human-friendly status string."""
+        if (self.context.buildstate == BuildStatus.NEEDSBUILD
+            and self.eta is None):
+            return 'No suitable builders'
+        return {
+            BuildStatus.NEEDSBUILD: 'Pending build',
+            BuildStatus.FULLYBUILT: 'Successful build',
+            BuildStatus.MANUALDEPWAIT: (
+                'Could not build because of missing dependencies'),
+            BuildStatus.CHROOTWAIT: (
+                'Could not build because of chroot problem'),
+            BuildStatus.SUPERSEDED: (
+                'Could not build because source package was superseded'),
+            BuildStatus.FAILEDTOUPLOAD: 'Could not be uploaded correctly',
+            }.get(self.context.buildstate, self.context.buildstate.title)
+
+    @property
+    def eta(self):
+        """The datetime when the build job is estimated to complete.
+
+        This is the BuildQueue.estimated_duration plus the
+        Job.date_started or BuildQueue.getEstimatedJobStartTime.
+        """
+        if self.context.buildqueue_record is None:
+            return None
+        queue_record = self.context.buildqueue_record
+        if queue_record.job.status == JobStatus.WAITING:
+            start_time = queue_record.getEstimatedJobStartTime()
+            if start_time is None:
+                return None
+        else:
+            start_time = queue_record.job.date_started
+        duration = queue_record.estimated_duration
+        return start_time + duration
+
+    @property
+    def date(self):
+        """The date when the build completed or is estimated to complete."""
+        if self.estimate:
+            return self.eta
+        return self.context.datebuilt
+
+    @property
+    def estimate(self):
+        """If true, the date value is an estimate."""
+        if self.context.datebuilt is not None:
+            return False
+        return self.eta is not None
+
+    def binary_builds(self):
+        return list(self.context.binary_builds)
+
+
+class SourcePackageRecipeBuildCancelView(LaunchpadFormView):
+    """View for cancelling a build."""
+
+    class schema(Interface):
+        """Schema for cancelling a build."""
+
+    page_title = label = "Cancel build"
+
+    @property
+    def cancel_url(self):
+        return canonical_url(self.context)
+    next_url = cancel_url
+
+    @action('Cancel build', name='cancel')
+    def request_action(self, action, data):
+        """Cancel the build."""
+        self.context.cancelBuild()

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-07-02 11:11:32 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-07-16 13:31:52 +0000
@@ -21,9 +21,9 @@
     DatabaseFunctionalLayer, LaunchpadFunctionalLayer)
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.code.browser.sourcepackagerecipe import (
-    SourcePackageRecipeView, SourcePackageRecipeRequestBuildsView,
-    SourcePackageRecipeBuildView
-)
+    SourcePackageRecipeView, SourcePackageRecipeRequestBuildsView)
+from lp.code.browser.sourcepackagerecipebuild import (
+    SourcePackageRecipeBuildView)
 from lp.code.interfaces.sourcepackagerecipe import MINIMAL_RECIPE_TEXT
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.model.processor import ProcessorFamily

=== added file 'lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py	2010-07-16 13:31:52 +0000
@@ -0,0 +1,91 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+# pylint: disable-msg=F0401,E1002
+
+"""Tests for the source package recipe view classes and templates."""
+
+__metaclass__ = type
+
+from mechanize import LinkNotFoundError
+import transaction
+from zope.component import getUtility
+
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
+from canonical.launchpad.webapp import canonical_url
+from canonical.testing import DatabaseFunctionalLayer
+from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.soyuz.model.processor import ProcessorFamily
+from lp.testing import ANONYMOUS, BrowserTestCase, login, logout
+
+
+class TestSourcePackageRecipeBuild(BrowserTestCase):
+    """Create some sample data for recipe tests."""
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        """Provide useful defaults."""
+        super(TestSourcePackageRecipeBuild, self).setUp()
+        self.chef = self.factory.makePerson(
+            displayname='Master Chef', name='chef', password='test')
+        self.user = self.chef
+        self.ppa = self.factory.makeArchive(
+            displayname='Secret PPA', owner=self.chef, name='ppa')
+        self.squirrel = self.factory.makeDistroSeries(
+            displayname='Secret Squirrel', name='secret', version='100.04',
+            distribution=self.ppa.distribution)
+        self.squirrel.nominatedarchindep = self.squirrel.newArch(
+            'i386', ProcessorFamily.get(1), False, self.chef,
+            supports_virtualized=True)
+
+    def makeRecipeBuild(self):
+        """Create and return a specific recipe."""
+        chocolate = self.factory.makeProduct(name='chocolate')
+        cake_branch = self.factory.makeProductBranch(
+            owner=self.chef, name='cake', product=chocolate)
+        recipe = self.factory.makeSourcePackageRecipe(
+            owner=self.chef, distroseries=self.squirrel, name=u'cake_recipe',
+            description=u'This recipe builds a foo for disto bar, with my'
+            ' Secret Squirrel changes.', branches=[cake_branch],
+            daily_build_archive=self.ppa)
+        build = self.factory.makeSourcePackageRecipeBuild(
+            recipe=recipe)
+        return build
+
+    def test_cancel_build(self):
+        """An admin can cancel a build."""
+        experts = getUtility(ILaunchpadCelebrities).bazaar_experts.teamowner
+        build = self.makeRecipeBuild()
+        transaction.commit()
+        build_url = canonical_url(build)
+        logout()
+
+        browser = self.getUserBrowser(build_url, user=experts)
+        browser.getLink('Cancel build').click()
+
+        self.assertEqual(
+            browser.getLink('Cancel').url,
+            build_url)
+
+        browser.getControl('Cancel build').click()
+
+        self.assertEqual(
+            browser.url,
+            build_url)
+
+        login(ANONYMOUS)
+        self.assertEqual(
+            BuildStatus.SUPERSEDED,
+            build.status)
+
+    def test_cancel_build_not_admin(self):
+        """No one but admins can cancel a build."""
+        build = self.makeRecipeBuild()
+        transaction.commit()
+        build_url = canonical_url(build)
+        logout()
+
+        browser = self.getUserBrowser(build_url, user=self.chef)
+        self.assertRaises(
+            LinkNotFoundError,
+            browser.getLink, 'Cancel build')

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipebuild.py'
--- lib/lp/code/interfaces/sourcepackagerecipebuild.py	2010-06-30 02:27:10 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipebuild.py	2010-07-16 13:31:52 +0000
@@ -76,6 +76,9 @@
     def getFileByName(filename):
         """Return the file under +files with specified name."""
 
+    def cancelBuild():
+        """Cancel the build."""
+
     def destroySelf():
         """Delete the build itself."""
 

=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/code/model/sourcepackagerecipebuild.py	2010-06-30 02:27:10 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py	2010-07-16 13:31:52 +0000
@@ -240,7 +240,8 @@
             recipe.is_stale = False
         return builds
 
-    def destroySelf(self):
+    def _unqueueBuild(self):
+        """Remove the build's queue and job."""
         store = Store.of(self)
         if self.buildqueue_record is not None:
             job = self.buildqueue_record.job
@@ -249,6 +250,15 @@
                 SourcePackageRecipeBuildJob,
                 SourcePackageRecipeBuildJob.build == self.id).remove()
             store.remove(job)
+
+    def cancelBuild(self):
+        """See `ISourcePackageRecipeBuild.`"""
+        self._unqueueBuild()
+        self.status = BuildStatus.SUPERSEDED
+
+    def destroySelf(self):
+        self._unqueueBuild()
+        store = Store.of(self)
         store.remove(self)
 
     @classmethod
@@ -309,6 +319,7 @@
         if build.status == BuildStatus.FULLYBUILT:
             build.notify()
 
+
 class SourcePackageRecipeBuildJob(BuildFarmJobOldDerived, Storm):
     classProvides(ISourcePackageRecipeBuildJobSource)
     implements(ISourcePackageRecipeBuildJob)

=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2010-06-30 02:27:10 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2010-07-16 13:31:52 +0000
@@ -294,6 +294,16 @@
         build = self.factory.makeSourcePackageRecipeBuild()
         build.destroySelf()
 
+    def test_cancelBuild(self):
+        # ISourcePackageRecipeBuild should make sure to remove jobs and build
+        # queue entries and then invalidate itself.
+        build = self.factory.makeSourcePackageRecipeBuild()
+        build.cancelBuild()
+
+        self.assertEqual(
+            BuildStatus.SUPERSEDED,
+            build.status)
+
 
 class TestAsBuildmaster(TestCaseWithFactory):
 

=== modified file 'lib/lp/code/templates/sourcepackagerecipebuild-index.pt'
--- lib/lp/code/templates/sourcepackagerecipebuild-index.pt	2010-05-05 19:16:24 +0000
+++ lib/lp/code/templates/sourcepackagerecipebuild-index.pt	2010-07-16 13:31:52 +0000
@@ -158,6 +158,16 @@
         (<span tal:replace="file/content/filesize/fmt:bytes" />)
       </li>
     </ul>
+
+    <div
+      style="margin-top: 1.5em"
+      tal:define="context_menu view/context/menu:context;
+                  link context_menu/cancel"
+      tal:condition="link/enabled"
+      >
+      <a tal:replace="structure link/fmt:link" />
+    </div>
+
   </metal:macro>
 
   <metal:macro define-macro="buildlog">