launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/builder-cleaning-ui into lp:launchpad.

Commit message:
Show 'Cleaning' instead of 'Idle' when a builder isn't clean.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/builder-cleaning-ui/+merge/223872

Show 'Cleaning' instead of 'Idle' when a builder isn't clean.
-- 
https://code.launchpad.net/~wgrant/launchpad/builder-cleaning-ui/+merge/223872
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/builder-cleaning-ui into lp:launchpad.

=== modified file 'lib/lp/buildmaster/templates/builder-index.pt'
--- lib/lp/buildmaster/templates/builder-index.pt	2013-12-03 04:46:23 +0000
+++ lib/lp/buildmaster/templates/builder-index.pt	2014-06-20 08:25:32 +0000
@@ -95,11 +95,17 @@
     <tal:no_job condition="not: job">
       <tal:builderok condition="builder/builderok">
         <tal:idle condition="not: builder/manual">
+          <tal:cleaning condition="not: builder/clean_status/enumvalue:CLEAN">
           <span class="sortkey" tal:content="string:0" />
+          <span class="sprite processing">Cleaning</span>
+          </tal:cleaning>
+          <tal:clean condition="builder/clean_status/enumvalue:CLEAN">
+          <span class="sortkey" tal:content="string:1" />
           <span class="sprite yes green">Idle</span>
+          </tal:clean>
         </tal:idle>
         <tal:manual tal:condition="builder/manual">
-          <span class="sortkey" tal:content="string:1" />
+          <span class="sortkey" tal:content="string:2" />
           <span class="sprite info">Manual</span>
         </tal:manual>
       </tal:builderok>

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-builder-page.txt'
--- lib/lp/soyuz/stories/soyuz/xx-builder-page.txt	2013-12-03 05:18:41 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-builder-page.txt	2014-06-20 08:25:32 +0000
@@ -67,6 +67,34 @@
 
     >>> print_feedback_messages(anon_browser.contents)
 
+Idle builders show more details of their status.
+
+    >>> from lp.buildmaster.enums import BuilderCleanStatus
+    >>> from lp.testing import admin_logged_in
+    >>> with admin_logged_in():
+    ...     builder = factory.makeBuilder(name='victim')
+    ...     builder.setCleanStatus(BuilderCleanStatus.DIRTY)
+    >>> anon_browser.open('http://launchpad.dev/builders/victim')
+    >>> print extract_text(find_portlet(
+    ...     anon_browser.contents, 'View full history Current status'))
+    View full history Current status
+    Cleaning
+    >>> with admin_logged_in():
+    ...     builder.setCleanStatus(BuilderCleanStatus.CLEANING)
+    >>> anon_browser.open(anon_browser.url)
+    >>> print extract_text(find_portlet(
+    ...     anon_browser.contents, 'View full history Current status'))
+    View full history Current status
+    Cleaning
+    >>> with admin_logged_in():
+    ...     builder.setCleanStatus(BuilderCleanStatus.CLEAN)
+    >>> anon_browser.open(anon_browser.url)
+    >>> print extract_text(find_portlet(
+    ...     anon_browser.contents, 'View full history Current status'))
+    View full history Current status
+    Idle
+
+
 Builder Actions
 ---------------
 
@@ -230,17 +258,18 @@
     >>> print extract_text(find_main_content(cprov_browser.contents))
     The Launchpad build farm
     Register a new build machine
-    0 available build machines, 1 disabled and 0 building of a total
-    of 1 registered.
+    1 available build machine, 1 disabled and 0 building of a total
+    of 2 registered.
     Builders
-    Name  Architectures Status
-    frog  386           Disabled
+    Name   Architectures Status
+    frog   386           Disabled
+    victim 386           Idle
     Updated on ...
     Official distributions build status
     Architecture Builders Queue
     PPA build status
     Architecture Builders Queue
-    386          0        empty
+    386          1        empty
 
     >>> cprov_browser.getLink('bob').click()
     Traceback (most recent call last):