Merge lp:~julian-edwards/launchpad/score-on-build-page-bug-433329 into lp:launchpad

[Julian Edwards]

Fix 2 trivial build-related bugs, 1. Make the build score appear whenever we know it,
2. Make the retry notification text less bizarre

Fix 2 trivial build-related bugs:
1. Make the build score appear whenever we know it
2. Make the retry notification text less bizarre

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py	2010-11-26 00:29:09 +0000
+++ lib/lp/soyuz/browser/build.py	2010-12-16 14:50:43 +0000
@@ -296,7 +296,7 @@
 
             # Invoke context method to retry the build record.
             self.context.retry()
-            self.request.response.addInfoNotification('Build record active')
+            self.request.response.addInfoNotification('Build retried')
 
         self.request.response.redirect(canonical_url(self.context))
 

=== modified file 'lib/lp/soyuz/stories/ppa/xx-copy-packages.txt'
--- lib/lp/soyuz/stories/ppa/xx-copy-packages.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/soyuz/stories/ppa/xx-copy-packages.txt	2010-12-16 14:50:43 +0000
@@ -301,7 +301,8 @@
     i386 build of pmount 0.1-1
     ...
     Build status Needs building
-    Start (2505) What's this?
+    Start
+    Build score:...
     Build details
     Source: pmount - 0.1-1
     Archive: PPA for James Blackwell

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
--- lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2010-08-30 02:07:38 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2010-12-16 14:50:43 +0000
@@ -66,7 +66,8 @@
     ...
     Build status
     Needs building
-    Start in ... (2505) What's this?
+    Start in ... 
+    Build score:2505 (What's this?)
     Build details
     Source: testing - 1.0
     Archive: Primary Archive for Ubuntu Test
@@ -88,6 +89,7 @@
     ...
     Build status
     Needs building
+    Build score:2505 (What's this?)
     Build details
     Source: testing - 1.0
     Archive: Primary Archive for Ubuntu Test
@@ -142,7 +144,8 @@
     >>> print extract_text(find_tag_by_id(admin_browser.contents, 'status'))
     Build status
     Needs building
-    Start in ... (0) Rescore build What's this?
+    Start in ... 
+    Build score:0 Rescore build (What's this?)
 
 Eventually a pending build record will get started, and while it's
 building the page will also contain a link to the builder where the
@@ -165,6 +168,7 @@
     ...     find_tag_by_id(anon_browser.contents, 'status'))
     Build status
     Currently building on Bob The Builder
+    Build score:0 (What's this?)
     Started ... ago
 
     >>> print anon_browser.getLink('Bob The Builder').url
@@ -283,12 +287,13 @@
     >>> admin_browser.getControl("Retry Build").click()
     >>> for text in get_feedback_messages(admin_browser.contents):
     ...     print text
-    Build record active
+    Build retried
 
     >>> print extract_text(find_tag_by_id(admin_browser.contents, 'status'))
     Build status
     Needs building
-    Start in ... (...) Rescore build What's this?
+    Start in ... 
+    Build score:... Rescore build (What's this?)
 
     >>> admin_browser.getLink("Retry this build").click()
     Traceback (most recent call last):
@@ -463,6 +468,7 @@
     >>> print extract_text(find_tag_by_id(anon_browser.contents, 'status'))
     Build status
     Successfully built on Bob The Builder
+    Build score:...
     Started on ...
     Finished on ... (took 5 minutes, 0.0 seconds)
     buildlog (6 bytes)

=== modified file 'lib/lp/soyuz/templates/build-index.pt'
--- lib/lp/soyuz/templates/build-index.pt	2010-11-30 12:53:20 +0000
+++ lib/lp/soyuz/templates/build-index.pt	2010-12-16 14:50:43 +0000
@@ -155,14 +155,16 @@
         <li tal:define="eta context/buildqueue_record/getEstimatedJobStartTime;">
           Start <tal:eta
             replace="eta/fmt:approximatedate">in 3 hours</tal:eta>
-            (<span tal:replace="view/buildqueue/lastscore"/>)
-            <tal:rescore define="link context/menu:context/rescore"
-                         condition="link/enabled"
-                         replace="structure link/fmt:icon" />
-            <a href="https://help.launchpad.net/Packaging/BuildScores"
-               target="_blank">What's this?</a>
         </li>
       </tal:pending>
+      <li tal:condition="view/buildqueue">
+        Build score:<span tal:replace="view/buildqueue/lastscore"/>
+          <tal:rescore define="link context/menu:context/rescore"
+                       condition="link/enabled"
+                       replace="structure link/fmt:icon" />
+          (<a href="https://help.launchpad.net/Packaging/BuildScores"
+             target="_blank">What's this?</a>)
+      </li>
       <tal:building condition="context/status/enumvalue:BUILDING">
         <li>
           Started