Merge lp:~al-maisan/launchpad/oops-526969 into lp:launchpad

[Muharem Hrnjadovic]

Dispatch time estimations are only shown for pending builds that are *not* suspended.

[Muharem Hrnjadovic (al-maisan)]

Hello,

since the build farm was generalized the binary builds became somewhat
schizophrenic.
In order to figure out whether a dispatch time estimate is available for a
build we now need to look at

    Build.buildstate *and* Job.status

These need to carry the values BuildStatus.NEEDSBUILD and JobStatus.WAITING
respectively.

The branch at hand revises the main build template to do so.

Tests to run:

    bin/test --v -t build-views -t xx-build-record

No "make lint" changes or errors.

[Jeroen T. Vermeulen (jtv)]

Looks fine, and the TAL ends up cleaner as well. The new tests check for the effect of the Job's status; the other half of the check is covered by existing tests.

Land it.

review: Approve (code)

=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py	2009-12-11 13:01:12 +0000
+++ lib/lp/soyuz/browser/build.py	2010-02-24 14:35:31 +0000
@@ -36,6 +36,7 @@
 from canonical.launchpad.webapp.batching import BatchNavigator
 from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
 from lazr.delegates import delegates
+from lp.services.job.interfaces.job import JobStatus
 
 
 class BuildUrl:
@@ -198,6 +199,18 @@
 
         return files
 
+    @property
+    def dispatch_time_estimate_available(self):
+        """True if a dispatch time estimate is available for this build.
+
+        The build must be in state NEEDSBUILD and the associated job must be
+        in state WAITING.
+        """
+        return (
+            self.context.buildstate == BuildStatus.NEEDSBUILD and
+            self.context.buildqueue_record.job.status == JobStatus.WAITING)
+
+
 class BuildRetryView(BuildView):
     """View class for retrying `IBuild`s"""
 

=== modified file 'lib/lp/soyuz/browser/tests/build-views.txt'
--- lib/lp/soyuz/browser/tests/build-views.txt	2009-12-24 01:41:54 +0000
+++ lib/lp/soyuz/browser/tests/build-views.txt	2010-02-24 14:35:31 +0000
@@ -372,3 +372,27 @@
     i386
 
 
+== Dispatch time estimates ==
+
+A dispatch time estimate is available for pending binary builds that have not
+been suspended.
+
+    >>> from lp.services.job.interfaces.job import JobStatus
+    >>> pending_build = ubuntu.getBuildRecords(
+    ...      build_state=BuildStatus.NEEDSBUILD)[0]
+
+    >>> view = create_initialized_view(pending_build, name="+index")
+    >>> view.dispatch_time_estimate_available
+    True
+    >>> view.context.buildstate == BuildStatus.NEEDSBUILD
+    True
+    >>> view.context.buildqueue_record.job.status == JobStatus.WAITING
+    True
+
+If we suspend the binary build job, however, no estimate is available.
+
+    >>> view.context.buildqueue_record.job.suspend()
+    >>> view.context.buildqueue_record.job.status == JobStatus.SUSPENDED
+    True
+    >>> view.dispatch_time_estimate_available
+    False

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
--- lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2010-01-11 23:43:59 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2010-02-24 14:35:31 +0000
@@ -72,6 +72,30 @@
     Pocket: Release
     Component: main
 
+Let's disable the job associated with the build. This has the side effect
+that a dispatch time estimation will not be available for the build in
+question.
+
+    >>> build.buildqueue_record.job.suspend()
+    >>> anon_browser.open(build_url)
+    >>> print extract_text(find_main_content(anon_browser.contents))
+    i386 build of testing 1.0 in ubuntutest breezy-autotest RELEASE
+    ...
+    Build status
+    Needs building
+    Build details
+    Source: testing - 1.0
+    Archive: Primary Archive for Ubuntu Test
+    Series: Breezy Badger Autotest
+    Architecture: i386
+    Pocket: Release
+    Component: main
+
+Re-enable the build in order to avioid subsequent test breakage.
+
+    >>> build.buildqueue_record.job.resume()
+    >>> anon_browser.open(build_url)
+
 The 'Build details' section exists for all status and contains links
 to all the relevant entities involed in this build.
 

=== modified file 'lib/lp/soyuz/templates/build-index.pt'
--- lib/lp/soyuz/templates/build-index.pt	2010-02-10 10:11:46 +0000
+++ lib/lp/soyuz/templates/build-index.pt	2010-02-24 14:35:31 +0000
@@ -146,7 +146,7 @@
         Missing build dependencies: <em
          tal:content="context/dependencies">x, y, z</em>
       </li>
-      <tal:pending condition="context/buildstate/enumvalue:NEEDSBUILD">
+      <tal:pending condition="view/dispatch_time_estimate_available">
         <li tal:define="eta context/buildqueue_record/getEstimatedJobStartTime;">
           Start <tal:eta
             replace="eta/fmt:approximatedate">in 3 hours</tal:eta>