A small change to EWS bubble text. Explain why there are messages for ineligible...
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Sep 2014 23:08:07 +0000 (23:08 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Sep 2014 23:08:07 +0000 (23:08 +0000)
Rubber-stamped by Tim Horton.

* QueueStatusServer/app.yaml:
* QueueStatusServer/handlers/statusbubble.py:
(StatusBubble._build_bubble):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@174092 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/QueueStatusServer/app.yaml
Tools/QueueStatusServer/handlers/statusbubble.py

index 3dd09d8..6485a89 100644 (file)
@@ -1,5 +1,15 @@
 2014-09-29  Alexey Proskuryakov  <ap@apple.com>
 
+        A small change to EWS bubble text. Explain why there are messages for ineligible patches.
+
+        Rubber-stamped by Tim Horton.
+
+        * QueueStatusServer/app.yaml:
+        * QueueStatusServer/handlers/statusbubble.py:
+        (StatusBubble._build_bubble):
+
+2014-09-29  Alexey Proskuryakov  <ap@apple.com>
+
         Typo fix, suggested by Tim Horton.
 
         * QueueStatusServer/handlers/statusbubble.py:
index 4f32fb8..958ac70 100644 (file)
@@ -1,5 +1,5 @@
 application: webkit-queues
-version: 174088 # Bugzilla bug ID of last major change
+version: 174192 # Bugzilla bug ID of last major change
 runtime: python
 api_version: 1
 
index 7547a5f..884d824 100644 (file)
@@ -139,7 +139,11 @@ class StatusBubble(webapp.RequestHandler):
                 bubble["state"] = "none"
                 bubble["details_message"] = "The patch is no longer eligible for processing."
                 if len(statuses) > 1:
-                    bubble["details_message"] += " Recent messages:\n\n" + "\n".join([status.message for status in statuses[1:]]) + "\n\n" + self._iso_time(statuses[0].date)
+                    if len(statuses) == 2:
+                        bubble["details_message"] += " One message was logged while the patch was still eligible:\n\n"
+                    else:
+                        bubble["details_message"] += " Some messages were logged while the patch was still eligible:\n\n"
+                    bubble["details_message"] += "\n".join([status.message for status in statuses[1:]]) + "\n\n" + self._iso_time(statuses[0].date)
             elif statuses[0].message == "Error: " + queue.name() + " unable to apply patch.":
                 bubble["state"] = "fail"
                 bubble["details_message"] = statuses[1].message + "\n\n" + self._iso_time(statuses[0].date)