Merge lp:~jtv/launchpad/bug-536797 into lp:launchpad

[Jeroen T. Vermeulen]

Minimal support for non-Soyuz build-farm jobs in builder UI.

= Bug 536797 =

The Builder UI is not very good at dealing with non-Soyuz build-farm jobs. Most build-farm job types have an IBuildBase associated with them, but not all. (It's not required by the IBuildFarmJob interface either).

This branch, after discussion with al-maisan, bigjools, noodles, wgrant, and probably others introduces a bit more UI support for coping with different types of build-farm job. It does this by introducing a few new interfaces: IBuildFarmBuildJob represents an IBuildFarmJob that also has an IBuild reference, and IBuildFarmBranchJob represents one that has an IBranch reference. These inherit from IBuildFarmJob so that zope can pick the most specific applicable interface to render in the UI.

You'll see a bunch of new templates: buildqueue-current.pt summarizes the IBuildQueue a Builder is currently working on. This then renders the associated IBuildQueue.specific_job, which can be one of several IBuildFarmJob-implementing types. These are differentiated along the lines of the IBuildFarmJob / IBuildFarmBuildJob / IBuildFarmBranchJob interface hierarchy. For the existing Soyuz-style build jobs this doesn't change the UI at all, apart from an icon that renders in a slightly different place.

I also added a link formatter for IBuildBase, to help cut down on complicated logic in the TAL.

In the same vein you'll see the access check for showing a job's log tail moved into security.py. Doing this in the TAL became too complicated with the different build types. It's quite possible that the current check is too strict; it may make sense to show a build's log if either its branch or its build is accessible. I think experience will have to show this. Soyuz is not the kind of thing you perfect all in one branch. In any case it's hard to exercise just now: our jobs that generate translation templates don't support private branches.

A BuildQueue's "current build duration" moves from the view into the model, which seems more appropriate and lets it reuse a "fake clock" fixture that's already there. I did replace some use of datetime.utcnow() with datetime.now(timezone('UTC')); the former returns timezone-unaware times which breaks several tests.

You'll note that some of the files I introduced deserve to be in better places. I filed a separate bug about this, because I've just about hit the limit of what I can do in one branch, and a step like that would need broader discussion.

To test (runs a lot of tests, but many exercise one change or another):
{{{
./bin/test -vv -t buildmaster -t soyuz -t 'translations.*build'
}}}

To Q/A, first off, browser around the /builders page. Then follow the instructions on https://dev.launchpad.net/Translations/BuildTemplatesOnLocalBuildFarm to create a TranslationTemplatesBuildJob, and look again. Now you'll see a different summary of the currently running job, since it has no associated IBuild.

I found no lint. I'm firing off an EC2 run to make sure I didn't miss any tests.

Jeroen

[Brad Crittenden (bac)]

Hi Jeroen,

Thanks for the nice agrarian branch.

Running your test command (was that just 'make check' in disguise?) I
got a failure on test_dispatchBuildToSlave.

Jeroen I tried on two different occasions to follow your instructions
in order to exercise the new UI. Both times were very time consuming
and ultimately failed. I give up. I approve the code but not the UI
-- you needed to get a separate UI review anyway but as a code
reviewer I like to have a once-over.

> === modified file 'lib/canonical/launchpad/security.py'
> --- lib/canonical/launchpad/security.py 2010-03-12 08:59:36 +0000
> +++ lib/canonical/launchpad/security.py 2010-03-16 11:13:21 +0000
> @@ -1505,6 +1508,41 @@
> return auth_spr.checkUnauthenticated()
>
>
> +class ViewBuildFarmJob(AuthorizationBase):
> + """Permission to view an `IBuildFarmJob`.
> +
> + This permission is based entirely on permission to view the
> + associated `IBuild` and/or `IBranch`.
> + """
> + permission = 'launchpad.View'
> + usedfor = IBuildFarmJob
> +
> + def _getBuildPermission(self):
> + return ViewBuildRecord(self.obj.build)
> +
> + def _checkBranchVisibility(self, user=None):
> + """Is the user free to view any branches associated with this job?"""
> + if not IBuildFarmBranchJob.providedBy(self.obj):
> + return True
> + else:
> + return self.obj.branch.visibleByUser(user)

I don't like the inverted test (our coding standards recommend against
having a 'not' test if both paths are present) and the fact a return
value of True has dual meanings.

> + def checkAuthenticated(self, user):
> + if not self._checkBranchVisibility(user):
> + return False
> +
> + if IBuildFarmBuildJob.providedBy(self.obj):
> + if not self._getBuildPermission().checkAuthenticated(user):
> + return False
> +
> + return True

Could you write a single method that provides checkAuthenticated and
checkUnauthenticated for your two possiblities? A nice little wrapper
would make the real methods more readable.

> + def checkUnauthenticated(self):
> + if not self._checkBranchVisibility():
> + return False
> + return self._getBuildPermission().checkUnauthenticated()

Again I find this implementation confusing.

> +
> class AdminQuestion(AdminByAdminsTeam):
> permission = 'launchpad.Admin'
> usedfor = IQuestion

> === modified file 'lib/canonical/launchpad/webapp/tales.py'
> --- lib/canonical/launchpad/webapp/tales.py 2010-03-10 12:50:18 +0000
> +++ lib/canonical/launchpad/webapp/tales.py 2010-03-16 11:13:21 +0000
> @@ -1514,6 +1514,33 @@
> return url
>
>
> +class BuildBaseFormatterAPI(ObjectFormatterAPI):
> + """Adapter providing fmt support for `IBuildBase` objects."""

You have plenty of room so please spell out formatter.

> + def _composeArchiveReference(self, archive):
> + if archive.is_ppa:
> + return " [%s/%s]" % (
> + cgi.escape(archive.owner.name), cgi.escape(archive.name))
> + else:
> + return ""
> +
> + def icon(self, view_name):
> + if not check_permi...

review: Approve (code)

[Jeroen T. Vermeulen (jtv)]

Hi Brad,

This is a really good review. Thanks for that! It does show that I was past my saturation point for this branch, doesn't it?

> Running your test command (was that just 'make check' in disguise?) I
> got a failure on test_dispatchBuildToSlave.

Hmm... my EC2 test came through clean though, as do my manual runs. You don't happen to have a log of this failure somewhere, do you? I wouldn't normally ask, but IIRC you were the one who wrote the retest tool, so you may have a more reliable habit of keeping them.

> Jeroen I tried on two different occasions to follow your instructions
> in order to exercise the new UI. Both times were very time consuming
> and ultimately failed. I give up. I approve the code but not the UI
> -- you needed to get a separate UI review anyway but as a code
> reviewer I like to have a once-over.

Alright. Sorry to put you to the trouble; this is indeed very hard work and it's been slowing me down no end. If you have any notes at all about what made it hard, please let me know so I can improve the documentation. I believe it's important to us to make this accessible to encourage development.

> > === modified file 'lib/canonical/launchpad/security.py'
> > --- lib/canonical/launchpad/security.py 2010-03-12 08:59:36 +0000
> > +++ lib/canonical/launchpad/security.py 2010-03-16 11:13:21 +0000
> > @@ -1505,6 +1508,41 @@
> > return auth_spr.checkUnauthenticated()
> >
> >
> > +class ViewBuildFarmJob(AuthorizationBase):
> > + """Permission to view an `IBuildFarmJob`.
> > +
> > + This permission is based entirely on permission to view the
> > + associated `IBuild` and/or `IBranch`.
> > + """
> > + permission = 'launchpad.View'
> > + usedfor = IBuildFarmJob
> > +
> > + def _getBuildPermission(self):
> > + return ViewBuildRecord(self.obj.build)
> > +
> > + def _checkBranchVisibility(self, user=None):
> > + """Is the user free to view any branches associated with this
> job?"""
> > + if not IBuildFarmBranchJob.providedBy(self.obj):
> > + return True
> > + else:
> > + return self.obj.branch.visibleByUser(user)
>
> I don't like the inverted test (our coding standards recommend against
> having a 'not' test if both paths are present) and the fact a return
> value of True has dual meanings.

You're right, of course. This is a missing final cleanup after various refactorings. I put the interface checks in separate "get {IBranch,IBuildBase} for this job if it has one" methods to isolate the complexity.

> > + def checkAuthenticated(self, user):
> > + if not self._checkBranchVisibility(user):
> > + return False
> > +
> > + if IBuildFarmBuildJob.providedBy(self.obj):
> > + if not self._getBuildPermission().checkAuthenticated(user):
> > + return False
> > +
> > + return True
>
> Could you write a single method that provides checkAuthenticated and
> checkUnauthenticated for your two possiblities? A nice little wrapper
> would make the real methods more readable.

TBH I still don't see why these security classes don't work like that in the first place. What cou...

[Jeroen T. Vermeulen (jtv)]

Went over this with wgrant, and (IIRC) noodles & bigjools. The conclusion was that the status icon for regular builds is now in the wrong place; even though it's the build status, it's shown in the UI as the builder status. And since I was traveling, wgrant has already landed a fix.

=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-03-06 04:57:40 +0000
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-03-17 06:01:34 +0000
@@ -322,7 +322,8 @@
     IStructuralSubscriptionTarget)
 
 patch_reference_property(
-    ISourcePackageRelease, 'source_package_recipe_build', ISourcePackageRecipeBuild)
+    ISourcePackageRelease, 'source_package_recipe_build',
+    ISourcePackageRecipeBuild)
 
 # IHasBugs
 patch_plain_parameter_type(
 
=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-03-16 10:47:00 +0000
+++ lib/canonical/launchpad/security.py	2010-03-17 06:01:34 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Security policies for using content objects."""
@@ -32,8 +32,9 @@
 from lp.bugs.interfaces.bugnomination import IBugNomination
 from lp.bugs.interfaces.bugsubscription import IBugSubscription
 from lp.bugs.interfaces.bugtracker import IBugTracker
-from lp.soyuz.interfaces.build import IBuild
 from lp.buildmaster.interfaces.builder import IBuilder, IBuilderSet
+from lp.buildmaster.interfaces.buildfarmbranchjob import IBuildFarmBranchJob
+from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
 from lp.code.interfaces.codeimport import ICodeImport
 from lp.code.interfaces.codeimportjob import (
     ICodeImportJobSet, ICodeImportJobWorkflow)
@@ -70,6 +71,8 @@
 from lp.soyuz.interfaces.packageset import IPackageset, IPackagesetSet
 from lp.translations.interfaces.pofile import IPOFile
 from lp.translations.interfaces.potemplate import IPOTemplate
+from lp.soyuz.interfaces.build import IBuild
+from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob
 from lp.soyuz.interfaces.publishing import (
     IBinaryPackagePublishingHistory, IPublishingEdit,
     ISourcePackagePublishingHistory)
@@ -1508,6 +1511,53 @@
         return auth_spr.checkUnauthenticated()
 
 
+class ViewBuildFarmJob(AuthorizationBase):
+    """Permission to view an `IBuildFarmJob`.
+
+    This permission is based entirely on permission to view the
+    associated `IBuild` and/or `IBranch`.
+    """
+    permission = 'launchpad.View'
+    usedfor = IBuildFarmJob
+
+    def _getBranch(self):
+        """Get `IBranch` associated with this job, if any."""
+        if IBuildFarmBranchJob.providedBy(self.obj):
+            return self.obj.branch
+        else:
+            return None
+
+    def _getBuild(self):
+        """Get `IBuildBase` associated with this job, if any."""
+        if IBuildFarmBuildJob.providedBy(self.obj):
+            return self.obj.build
+        else:
+            return None
+
+    def _checkBuildPermission(self, user=None):
+        """Check access to `IBuildBase` for this job."""
+        permission = ViewBuildRecord(self.obj.build)
+        if user is None:
+            return permission.checkUnauthenticated()
+        else:
+            return permission.checkAuthenticated(user)
+
+    def _checkAccess(self, user=None):
+        """Unified access check for anonymous and authenticated users."""
+        branch = self._getBranch()
+        if branch is not None and not branch.visibleByUser(user):
+            return False
+
+        build = self._getBuild()
+        if build is not None and not self._checkBuildPermission(user):
+            return False
+
+        return True
+
+    checkAuthenticated = _checkAccess
+    checkUnauthenticated = _checkAccess
+
+
 class AdminQuestion(AdminByAdminsTeam):
     permission = 'launchpad.Admin'
     usedfor = IQuestion
 
=== modified file 'lib/canonical/launchpad/webapp/configure.zcml'
--- lib/canonical/launchpad/webapp/configure.zcml	2010-02-17 11:13:06 +0000
+++ lib/canonical/launchpad/webapp/configure.zcml	2010-03-17 06:01:34 +0000
@@ -426,6 +426,13 @@
         />
 
     <adapter
+        for="lp.buildmaster.interfaces.buildbase.IBuildBase"
+        provides="zope.traversing.interfaces.IPathAdapter"
+        factory="canonical.launchpad.webapp.tales.BuildBaseFormatterAPI"
+        name="fmt"
+        />
+
+    <adapter
         for="lp.code.interfaces.codeimportmachine.ICodeImportMachine"
         provides="zope.traversing.interfaces.IPathAdapter"
         factory="canonical.launchpad.webapp.tales.CodeImportMachineFormatterAPI"
 
=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py	2010-03-10 12:50:18 +0000
+++ lib/canonical/launchpad/webapp/tales.py	2010-03-17 06:01:34 +0000
@@ -1514,6 +1514,33 @@
         return url
 
 
+class BuildBaseFormatterAPI(ObjectFormatterAPI):
+    """Adapter providing fmt support for `IBuildBase` objects."""
+    def _composeArchiveReference(self, archive):
+        if archive.is_ppa:
+            return " [%s/%s]" % (
+                cgi.escape(archive.owner.name), cgi.escape(archive.name))
+        else:
+            return ""
+
+    def icon(self, view_name):
+        if not check_permission('launchpad.View', self._context):
+            return '<img src="/@@/processing" alt="[build]" />'
+
+        return BuildImageDisplayAPI(self._context).icon()
+
+    def link(self, view_name, rootsite=None):
+        icon = self.icon(view_name)
+        build = self._context
+        if not check_permission('launchpad.View', build):
+            return '%s private source' % icon
+
+        url = self.url(view_name=view_name, rootsite=rootsite)
+        title = cgi.escape(build.title)
+        archive = self._composeArchiveReference(build.archive)
+        return '<a href="%s">%s%s</a>%s' % (url, icon, title, archive)
+
+
 class CodeImportMachineFormatterAPI(CustomizableFormatter):
     """Adapter providing fmt support for CodeImport objects"""
 
 
=== added file 'lib/lp/buildmaster/interfaces/buildfarmbranchjob.py'
--- lib/lp/buildmaster/interfaces/buildfarmbranchjob.py	1970-01-01 00:00:00 +0000
+++ lib/lp/buildmaster/interfaces/buildfarmbranchjob.py	2010-03-17 06:01:34 +0000
@@ -0,0 +1,21 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Interface for `IBuildFarmJob`s that are also `IBranchJob`s."""
+
+__metaclass__ = type
+__all__ = [
+    'IBuildFarmBranchJob'
+    ]
+
+from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
+from lp.code.interfaces.branchjob import IBranchJob
+
+
+class IBuildFarmBranchJob(IBuildFarmJob, IBranchJob):
+    """An `IBuildFarmJob` that's also an `IBranchJob`.
+
+    Use this interface for `IBuildFarmJob` implementations that do not
+    have a "build" attribute but do implement `IBranchJob`, so that the
+    UI can render appropriate status information.
+    """
 
=== modified file 'lib/lp/buildmaster/interfaces/buildfarmjob.py'
--- lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-01-30 05:27:48 +0000
+++ lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-03-17 06:01:34 +0000
@@ -91,7 +91,6 @@
             "return None."))
 
 
-
 class ISpecificBuildFarmJobClass(Interface):
     """Class interface provided by `IBuildFarmJob` classes.
 
 
=== modified file 'lib/lp/buildmaster/interfaces/buildqueue.py'
--- lib/lp/buildmaster/interfaces/buildqueue.py	2010-03-05 13:52:32 +0000
+++ lib/lp/buildmaster/interfaces/buildqueue.py	2010-03-17 06:01:34 +0000
@@ -72,6 +72,10 @@
         title=_("Estimated Job Duration"), required=True,
         description=_("Estimated job duration interval."))
 
+    current_build_duration = Timedelta(
+        title=_("Current build duration"), required=False,
+        description=_("Time spent building so far."))
+
     def manualScore(value):
         """Manually set a score value to a queue item and lock it."""
 
 
=== modified file 'lib/lp/buildmaster/model/buildqueue.py'
--- lib/lp/buildmaster/model/buildqueue.py	2010-03-08 12:53:59 +0000
+++ lib/lp/buildmaster/model/buildqueue.py	2010-03-17 06:01:34 +0000
@@ -14,6 +14,7 @@
 from collections import defaultdict
 from datetime import datetime, timedelta
 import logging
+import pytz
 
 from sqlobject import (
     StringCol, ForeignKey, BoolCol, IntCol, IntervalCol, SQLObjectNotFound)
@@ -118,6 +119,15 @@
         """See `IBuildQueue`."""
         return self.job.date_started
 
+    @property
+    def current_build_duration(self):
+        """See `IBuildQueue`."""
+        date_started = self.date_started
+        if date_started is None:
+            return None
+        else:
+            return self._now() - date_started
+
     def destroySelf(self):
         """Remove this record and associated job/specific_job."""
         job = self.job
@@ -464,8 +474,8 @@
 
     @staticmethod
     def _now():
-        """Provide utcnow() while allowing test code to monkey-patch this."""
-        return datetime.utcnow()
+        """Return current time (UTC).  Overridable for test purposes."""
+        return datetime.now(pytz.UTC)
 
 
 class BuildQueueSet(object):
 
=== modified file 'lib/lp/buildmaster/tests/test_buildqueue.py'
--- lib/lp/buildmaster/tests/test_buildqueue.py	2010-03-10 21:30:57 +0000
+++ lib/lp/buildmaster/tests/test_buildqueue.py	2010-03-17 06:01:34 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 # pylint: disable-msg=C0324
 
@@ -6,13 +6,14 @@
 
 from datetime import datetime, timedelta
 from pytz import utc
+from unittest import TestLoader
 
 from zope.component import getUtility
 from zope.interface.verify import verifyObject
 
 from canonical.launchpad.webapp.interfaces import (
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
-from canonical.testing import LaunchpadZopelessLayer
+from canonical.testing import LaunchpadZopelessLayer, ZopelessDatabaseLayer
 
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.builder import IBuilderSet
@@ -28,6 +29,7 @@
 from lp.soyuz.model.build import Build
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 from lp.testing import TestCaseWithFactory
+from lp.testing.fakemethod import FakeMethod
 
 
 def find_job(test, name, processor='386'):
@@ -140,10 +142,12 @@
     This avoids spurious test failures.
     """
     # Use the date/time the job started if available.
-    time_stamp = buildqueue.job.date_started
-    if not time_stamp:
-        time_stamp = datetime.now(utc)
-    buildqueue._now = lambda: time_stamp
+    if buildqueue.job.date_started:
+        time_stamp = buildqueue.job.date_started
+    else:
+        time_stamp = buildqueue._now()
+
+    buildqueue._now = FakeMethod(result=time_stamp)
     return time_stamp
 
 
@@ -209,7 +213,6 @@
             "An active build job must have a builder.")
 
 
-
 class TestBuildQueueBase(TestCaseWithFactory):
     """Setup the test publisher and some builders."""
 
@@ -605,6 +608,7 @@
         # fact that no builders capable of running the job are available.
         check_mintime_to_builder(self, job, 0)
 
+
 class MultiArchBuildsBase(TestBuildQueueBase):
     """Set up a test environment with builds and multiple processors."""
     def setUp(self):
@@ -805,6 +809,27 @@
         check_mintime_to_builder(self, apg_job, 0)
 
 
+class TestBuildQueueDuration(TestCaseWithFactory):
+    layer = ZopelessDatabaseLayer
+
+    def _makeBuildQueue(self):
+        """Produce a `BuildQueue` object to test."""
+        return self.factory.makeSourcePackageRecipeBuildJob()
+
+    def test_current_build_duration_not_started(self):
+        buildqueue = self._makeBuildQueue()
+        self.assertEqual(None, buildqueue.current_build_duration)
+
+    def test_current_build_duration(self):
+        buildqueue = self._makeBuildQueue()
+        now = buildqueue._now()
+        buildqueue._now = FakeMethod(result=now)
+        age = timedelta(minutes=3)
+        buildqueue.job.date_started = now - age
+
+        self.assertEqual(age, buildqueue.current_build_duration)
+
+
 class TestJobClasses(TestCaseWithFactory):
     """Tests covering build farm job type classes."""
     layer = LaunchpadZopelessLayer
@@ -1301,3 +1326,7 @@
         assign_to_builder(self, 'xxr-daptup', 1, None)
         postgres_build, postgres_job = find_job(self, 'postgres', '386')
         check_estimate(self, postgres_job, 120)
+
+
+def test_suite():
+    return TestLoader().loadTestsFromName(__name__)
 
=== modified file 'lib/lp/code/interfaces/sourcepackagerecipebuild.py'
--- lib/lp/code/interfaces/sourcepackagerecipebuild.py	2010-02-19 06:34:18 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipebuild.py	2010-03-17 06:01:34 +0000
@@ -21,7 +21,7 @@
 from canonical.launchpad import _
 
 from lp.buildmaster.interfaces.buildbase import IBuildBase
-from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
+from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob
 from lp.code.interfaces.sourcepackagerecipe import ISourcePackageRecipe
 from lp.registry.interfaces.person import IPerson
 from lp.registry.interfaces.distroseries import IDistroSeries
@@ -79,18 +79,13 @@
         """
 
 
-class ISourcePackageRecipeBuildJob(IBuildFarmJob):
+class ISourcePackageRecipeBuildJob(IBuildFarmBuildJob):
     """A read-only interface for recipe build jobs."""
 
     job = Reference(
         IJob, title=_("Job"), required=True, readonly=True,
         description=_("Data common to all job types."))
 
-    build = Reference(
-        ISourcePackageRecipeBuild, title=_("Build"),
-        required=True, readonly=True,
-        description=_("Build record associated with this job."))
-
 
 class ISourcePackageRecipeBuildJobSource(Interface):
     """A utility of this interface used to create _things_."""
 
=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py	2010-03-10 13:28:55 +0000
+++ lib/lp/soyuz/browser/build.py	2010-03-17 06:01:34 +0000
@@ -525,4 +525,3 @@
     @property
     def no_results(self):
         return self.form_submitted and not self.complete_builds
-
 
=== modified file 'lib/lp/soyuz/browser/builder.py'
--- lib/lp/soyuz/browser/builder.py	2010-03-08 05:30:13 +0000
+++ lib/lp/soyuz/browser/builder.py	2010-03-17 06:01:34 +0000
@@ -18,9 +18,7 @@
     'BuilderView',
     ]
 
-import datetime
 import operator
-import pytz
 
 from zope.component import getUtility
 from zope.event import notify
@@ -235,14 +233,10 @@
 
     @property
     def current_build_duration(self):
-        """Return the delta representing the duration of the current job."""
-        if (self.context.currentjob is None or
-            self.context.currentjob.date_started is None):
+        if self.context.currentjob is None:
             return None
         else:
-            UTC = pytz.timezone('UTC')
-            date_started = self.context.currentjob.date_started
-            return datetime.datetime.now(UTC) - date_started
+            return self.context.currentjob.current_build_duration
 
     @property
     def page_title(self):
 
=== modified file 'lib/lp/soyuz/browser/configure.zcml'
--- lib/lp/soyuz/browser/configure.zcml	2010-03-08 05:30:13 +0000
+++ lib/lp/soyuz/browser/configure.zcml	2010-03-17 06:01:34 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd.  This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
      GNU Affero General Public License version 3 (see the file LICENSE).
 -->
 
@@ -798,4 +798,34 @@
         path_expression="string:+dependency/${dependency/id}"
         attribute_to_parent="archive"
         />
+
+    <!-- XXX JeroenVermeulen 2010-03-13 bug=539395: This is buildmaster, not soyuz -->
+    <browser:page
+        for="lp.buildmaster.interfaces.buildqueue.IBuildQueue"
+        name="+current"
+        class="canonical.launchpad.webapp.publisher.LaunchpadView"
+        facet="overview"
+        permission="launchpad.View"
+        template="../templates/buildqueue-current.pt"/>
+    <browser:page
+        for="lp.buildmaster.interfaces.buildqueue.IBuildFarmJob"
+        name="+current"
+        class="canonical.launchpad.webapp.publisher.LaunchpadView"
+        facet="overview"
+        permission="launchpad.View"
+        template="../templates/buildfarmjob-current.pt"/>
+    <browser:page
+        for="lp.buildmaster.interfaces.buildfarmbranchjob.IBuildFarmBranchJob"
+        name="+current"
+        class="canonical.launchpad.webapp.publisher.LaunchpadView"
+        facet="overview"
+        permission="launchpad.View"
+        template="../templates/buildfarmbranchjob-current.pt"/>
+    <browser:page
+        for="lp.soyuz.interfaces.buildfarmbuildjob.IBuildFarmBuildJob"
+        name="+current"
+        class="canonical.launchpad.webapp.publisher.LaunchpadView"
+        facet="overview"
+        permission="launchpad.View"
+        template="../templates/buildfarmbuildjob-current.pt"/>
 </configure>
 
=== modified file 'lib/lp/soyuz/doc/build-estimated-dispatch-time.txt'
--- lib/lp/soyuz/doc/build-estimated-dispatch-time.txt	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/doc/build-estimated-dispatch-time.txt	2010-03-17 06:01:34 +0000
@@ -56,7 +56,6 @@
 
     >>> from datetime import datetime
     >>> import pytz
-    >>> UTC = pytz.timezone('UTC')
     >>> bob_the_builder = builder_set.get(1)
     >>> cur_bqueue = bob_the_builder.currentjob
     >>> from lp.soyuz.interfaces.build import IBuildSet
@@ -76,7 +75,7 @@
     >>> from zope.security.proxy import removeSecurityProxy
     >>> cur_bqueue.lastscore = 1111
     >>> cur_bqueue.setDateStarted(
-    ...     datetime(2008, 4, 1, 10, 45, 39, tzinfo=UTC))
+    ...     datetime(2008, 4, 1, 10, 45, 39, tzinfo=pytz.UTC))
     >>> print cur_bqueue.date_started
     2008-04-01 10:45:39+00:00
 
@@ -89,7 +88,7 @@
 The estimated start time for the pending job is either now or lies
 in the future.
 
-    >>> now = datetime.utcnow()
+    >>> now = datetime.now(pytz.UTC)
     >>> def job_start_estimate(build):
     ...     return build.buildqueue_record.getEstimatedJobStartTime()
     >>> estimate = job_start_estimate(alsa_build)
@@ -147,7 +146,7 @@
 Since the 'iceweasel' build has a higher score (666) than the 'pmount'
 build (66) its estimated dispatch time is essentially "now".
 
-    >>> now = datetime.utcnow()
+    >>> now = datetime.now(pytz.UTC)
     >>> estimate = job_start_estimate(iceweasel_build)
     >>> estimate > now
     True
 
=== added file 'lib/lp/soyuz/interfaces/buildfarmbuildjob.py'
--- lib/lp/soyuz/interfaces/buildfarmbuildjob.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/interfaces/buildfarmbuildjob.py	2010-03-17 06:01:34 +0000
@@ -0,0 +1,21 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Interface to support UI for most build-farm jobs."""
+
+__metaclass__ = type
+__all__ = [
+    'IBuildFarmBuildJob'
+    ]
+
+from canonical.launchpad import _
+from lazr.restful.fields import Reference
+from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
+from lp.soyuz.interfaces.build import IBuild
+
+
+class IBuildFarmBuildJob(IBuildFarmJob):
+    """An `IBuildFarmJob` with an `IBuild` reference."""
+    build = Reference(
+        IBuild, title=_("Build"), required=True, readonly=True,
+        description=_("Build record associated with this job."))
 
=== modified file 'lib/lp/soyuz/interfaces/buildpackagejob.py'
--- lib/lp/soyuz/interfaces/buildpackagejob.py	2010-01-20 22:09:26 +0000
+++ lib/lp/soyuz/interfaces/buildpackagejob.py	2010-03-17 06:01:34 +0000
@@ -15,12 +15,12 @@
 
 from canonical.launchpad import _
 from lazr.restful.fields import Reference
-from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
 from lp.services.job.interfaces.job import IJob
 from lp.soyuz.interfaces.build import IBuild
-
-
-class IBuildPackageJob(IBuildFarmJob):
+from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob
+
+
+class IBuildPackageJob(IBuildFarmBuildJob):
     """A read-only interface for build package jobs."""
 
     id = Int(title=_('ID'), required=True, readonly=True)
 
=== modified file 'lib/lp/soyuz/templates/builder-index.pt'
--- lib/lp/soyuz/templates/builder-index.pt	2009-11-12 16:19:18 +0000
+++ lib/lp/soyuz/templates/builder-index.pt	2010-03-17 06:01:34 +0000
@@ -104,32 +104,10 @@
       </tal:buildernok>
     </tal:no_job>
 
-    <tal:comment replace="nothing">
-      In the very near future, 'job' will not just be a Build job.
-      The template needs to cope with that as and when new job types are
-      added.
-    </tal:comment>
-    <tal:job condition="job">
+    <tal:job-header condition="job">
       <span class="sortkey" tal:content="job/id" />
-      <tal:build define="build job/specific_job/build">
-        <tal:visible condition="build/required:launchpad.View">
-          <tal:icon replace="structure build/image:icon" />
-          Building
-          <a tal:attributes="href build/fmt:url"
-             tal:content="build/title"
-            >i386 build of mozilla-firefox 0.9 in ubuntu hoary RELEASE</a>
-          <tal:ppa condition="build/archive/is_ppa"
-                   define="ppa build/archive;">
-            <span tal:replace="string: [${ppa/owner/name}/${ppa/name}]"
-              >[cprov/ppa]</span>
-          </tal:ppa>
-        </tal:visible>
-        <tal:restricted condition="not: build/required:launchpad.View">
-          <img src="/@@/processing" alt="[building]" />
-          Building private source
-        </tal:restricted>
-      </tal:build>
-    </tal:job>
+      <tal:specific-job replace="structure job/specific_job/@@+current" />
+    </tal:job-header>
 
   </metal:macro>
 
@@ -147,7 +125,7 @@
         </span>
       Current status</h2>
 
-      <p tal:define="builder context">
+      <p tal:define="builder context" id="current-build-summary">
         <metal:summary use-macro="template/macros/status-summary" />
       </p>
 
@@ -156,27 +134,7 @@
                           context/failnotes/fmt:text-to-html" />
       </tal:buildernok>
 
-      <tal:job condition="job">
-        <p class="sprite">Started
-          <span tal:attributes="title job/job/date_started/fmt:datetime"
-                tal:content="view/current_build_duration/fmt:exactduration"
-            /> ago.</p>
-        <tal:visible
-           define="build job/specific_job/build"
-           condition="build/required:launchpad.View">
-          <tal:logtail condition="job/logtail">
-            <h3>Buildlog</h3>
-            <div tal:content="structure job/logtail/fmt:text-to-html"
-                 id="buildlog-tail" class="logtail">
-              Things are crashing and burning all over the place.
-            </div>
-            <p class="discreet" tal:condition="view/user">
-              Updated on
-              <span tal:replace="structure view/user/fmt:local-time"/>
-            </p>
-          </tal:logtail>
-        </tal:visible>
-      </tal:job>
+      <tal:job condition="job" replace="structure job/@@+current" />
     </div>
 
   </metal:macro>
 
=== added file 'lib/lp/soyuz/templates/buildfarmbranchjob-current.pt'
--- lib/lp/soyuz/templates/buildfarmbranchjob-current.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/templates/buildfarmbranchjob-current.pt	2010-03-17 06:01:34 +0000
@@ -0,0 +1,11 @@
+<tal:root
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  omit-tag="">
+
+  <img src="/@@/processing" alt="[building]" />
+  Working on
+  <tal:jobtype replace="context/__class__/__name__" />
+  for branch <tal:branch replace="structure context/branch/fmt:link" />.
+</tal:root>
 
=== added file 'lib/lp/soyuz/templates/buildfarmbuildjob-current.pt'
--- lib/lp/soyuz/templates/buildfarmbuildjob-current.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/templates/buildfarmbuildjob-current.pt	2010-03-17 06:01:34 +0000
@@ -0,0 +1,8 @@
+<tal:root
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  omit-tag="">
+
+  Building <tal:build replace="structure context/build/fmt:link" />
+</tal:root>
 
=== added file 'lib/lp/soyuz/templates/buildfarmjob-current.pt'
--- lib/lp/soyuz/templates/buildfarmjob-current.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/templates/buildfarmjob-current.pt	2010-03-17 06:01:34 +0000
@@ -0,0 +1,10 @@
+<tal:root
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  omit-tag="">
+
+  <img src="/@@/processing" alt="[building]" />
+  Working on
+  <tal:jobtype replace="context/__class__/__name__" />.
+</tal:root>
 
=== added file 'lib/lp/soyuz/templates/buildqueue-current.pt'
--- lib/lp/soyuz/templates/buildqueue-current.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/templates/buildqueue-current.pt	2010-03-17 06:01:34 +0000
@@ -0,0 +1,24 @@
+<tal:root
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  omit-tag="">
+
+  <p class="sprite">Started
+    <span
+      tal:attributes="title context/job/date_started/fmt:datetime"
+      tal:content="context/current_build_duration/fmt:exactduration" />
+    ago.
+  </p>
+  <tal:logtail condition="context/specific_job/required:launchpad.View">
+    <h2>Buildlog</h2>
+    <div tal:content="structure context/logtail/fmt:text-to-html"
+         id="buildlog-tail"
+         class="logtail">
+      Things are crashing and burning all over the place.
+    </div>
+    <p class="discreet" tal:condition="view/user">
+      Updated on <tal:date replace="structure view/user/fmt:local-time" />
+    </p>
+  </tal:logtail>
+</tal:root>
 
=== modified file 'lib/lp/translations/model/translationtemplatesbuildjob.py'
--- lib/lp/translations/model/translationtemplatesbuildjob.py	2010-03-06 00:21:57 +0000
+++ lib/lp/translations/model/translationtemplatesbuildjob.py	2010-03-17 06:01:34 +0000
@@ -19,10 +19,11 @@
     DEFAULT_FLAVOR, IStoreSelector, MAIN_STORE, MASTER_FLAVOR)
 
 from lp.buildmaster.interfaces.buildfarmjob import (
-    BuildFarmJobType, IBuildFarmJob, ISpecificBuildFarmJobClass)
+    BuildFarmJobType, ISpecificBuildFarmJobClass)
 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
 from lp.buildmaster.model.buildqueue import BuildQueue
-from lp.code.interfaces.branchjob import IBranchJob, IRosettaUploadJobSource
+from lp.code.interfaces.branchjob import IRosettaUploadJobSource
+from lp.buildmaster.interfaces.buildfarmbranchjob import IBuildFarmBranchJob
 from lp.code.model.branchjob import BranchJob, BranchJobDerived, BranchJobType
 from lp.translations.interfaces.translationtemplatesbuildjob import (
     ITranslationTemplatesBuildJobSource)
@@ -34,7 +35,7 @@
 
     Implementation-wise, this is actually a `BranchJob`.
     """
-    implements(IBranchJob, IBuildFarmJob)
+    implements(IBuildFarmBranchJob)
 
     class_job_type = BranchJobType.TRANSLATION_TEMPLATES_BUILD
 
@@ -101,7 +102,7 @@
         """See `ITranslationTemplatesBuildJobSource`."""
         store = getUtility(IStoreSelector).get(MAIN_STORE, MASTER_FLAVOR)
 
-        # We don't have any JSON metadata for this BranchJob type.
+        # Pass public HTTP URL for the branch.
         metadata = {'branch_url': branch.composePublicURL()}
         branch_job = BranchJob(
             branch, BranchJobType.TRANSLATION_TEMPLATES_BUILD, metadata)
 
=== added directory 'lib/lp/translations/stories/buildfarm'
=== added file 'lib/lp/translations/stories/buildfarm/xx-build-summary.txt'
--- lib/lp/translations/stories/buildfarm/xx-build-summary.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/stories/buildfarm/xx-build-summary.txt	2010-03-17 06:01:34 +0000
@@ -0,0 +1,69 @@
+= TranslationTemplatesBuildJob Build Summary =
+
+The builders UI can show TranslationTemplateBuildJobs, although they
+look a little different from Soyuz-style jobs.
+
+== Setup ==
+
+Create a builder working on a TranslationTemplatesBuildJob for a branch.
+
+    >>> from zope.component import getUtility
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from canonical.launchpad.interfaces.librarian import (
+    ...     ILibraryFileAliasSet)
+    >>> from canonical.launchpad.scripts.logger import QuietFakeLogger
+    >>> from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
+    >>> from lp.testing.fakemethod import FakeMethod
+    >>> from lp.translations.interfaces.translations import (
+    ...     TranslationsBranchImportMode)
+
+    >>> class FakeSlave:
+    ...     resume = FakeMethod(result=('stdout', 'stderr', 0))
+    ...     build = FakeMethod()
+    ...     cacheFile = FakeMethod()
+
+    >>> login(ANONYMOUS)
+    >>> owner_email = factory.getUniqueString() + '@example.com'
+    >>> owner = factory.makePerson(email=owner_email, password='test')
+
+    >>> productseries = factory.makeProductSeries(owner=owner)
+    >>> product = productseries.product
+    >>> product.official_rosetta = True
+    >>> branch = factory.makeProductBranch(product=product, owner=owner)
+    >>> branch_url = branch.unique_name
+
+    >>> productseries.branch = factory.makeBranch()
+    >>> productseries.translations_autoimport_mode = (
+    ...     TranslationsBranchImportMode.IMPORT_TEMPLATES)
+    >>> specific_job = factory.makeTranslationTemplatesBuildJob(branch=branch)
+    >>> buildqueue = getUtility(IBuildQueueSet).getByJob(specific_job.job)
+
+    >>> fake_chroot = getUtility(ILibraryFileAliasSet)[1]
+    >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
+    >>> unused = ubuntu.currentseries.nominatedarchindep.addOrUpdateChroot(
+    ...     fake_chroot)
+
+    >>> builder = factory.makeBuilder(vm_host=factory.getUniqueString())
+    >>> builder.setSlaveForTesting(FakeSlave())
+    >>> builder.startBuild(buildqueue, QuietFakeLogger())
+
+    >>> builder_page = canonical_url(builder)
+    >>> logout()
+
+Helper: find the current build's summary on a browser's current page.
+
+    >>> def find_build_summary(browser):
+    ...     return find_tag_by_id(browser.contents, 'current-build-summary')
+
+
+== Show summary ==
+
+The job's summary shows that what type of job this is.  It also links
+to the branch.
+
+    >>> user_browser.open(builder_page)
+    >>> print extract_text(find_build_summary(user_browser))
+    Working on TranslationTemplatesBuildJob for branch ...
+
+    >>> user_browser.getLink(branch_url).click()