Unreviewed, rolling out r147773 and r147774.
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Apr 2013 20:04:25 +0000 (20:04 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Apr 2013 20:04:25 +0000 (20:04 +0000)
http://trac.webkit.org/changeset/147773
http://trac.webkit.org/changeset/147774
https://bugs.webkit.org/show_bug.cgi?id=114056

Causing some exceptions on AppEngine I don't understand
(Requested by rniwa on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-04-05

* QueueStatusServer/config/queues.py:
* QueueStatusServer/model/queues.py:
(Queue.short_name):
(Queue.display_name):
* QueueStatusServer/model/queues_unittest.py:
(QueueTest.test_short_name):
(QueueTest.test_display_name):
(QueueTest.test_name_with_underscores):

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

Tools/ChangeLog
Tools/QueueStatusServer/config/queues.py
Tools/QueueStatusServer/model/queues.py
Tools/QueueStatusServer/model/queues_unittest.py

index 27e42eb..ad40ac8 100644 (file)
@@ -1,3 +1,22 @@
+2013-04-05  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r147773 and r147774.
+        http://trac.webkit.org/changeset/147773
+        http://trac.webkit.org/changeset/147774
+        https://bugs.webkit.org/show_bug.cgi?id=114056
+
+        Causing some exceptions on AppEngine I don't understand
+        (Requested by rniwa on #webkit).
+
+        * QueueStatusServer/config/queues.py:
+        * QueueStatusServer/model/queues.py:
+        (Queue.short_name):
+        (Queue.display_name):
+        * QueueStatusServer/model/queues_unittest.py:
+        (QueueTest.test_short_name):
+        (QueueTest.test_display_name):
+        (QueueTest.test_name_with_underscores):
+
 2013-04-05  Geoffrey Garen  <ggaren@apple.com>
 
         Fixed run-bindings-tests by removing V8
index 7368af1..99bf34f 100644 (file)
@@ -30,6 +30,9 @@
 all_queue_names = [
     "commit-queue",
     "style-queue",
+    "chromium-ews",  # aka cr-linux-ews
+    "cr-linux-debug-ews",
+    "cr-android-ews",
     "qt-ews",
     "qt-wk2-ews",
     "gtk-ews",
index d350473..b32f69e 100644 (file)
@@ -69,13 +69,17 @@ class Queue(object):
     # For use in status bubbles or table headers
     def short_name(self):
         # HACK: chromium-ews is incorrectly named.
-        short_name = self._name.replace("-ews", "")
+        short_name = self._name.replace("chromium-ews", "Cr-Linux-ews")
+        short_name = short_name.replace("-ews", "")
         short_name = short_name.replace("-queue", "")
         return self._caplitalize_after_dash(short_name.capitalize())
 
     def display_name(self):
         # HACK: chromium-ews is incorrectly named.
-        display_name = self._name.replace("-", " ")
+        display_name = self._name.replace("chromium-ews", "cr-linux-ews")
+
+        display_name = display_name.replace("-", " ")
+        display_name = display_name.replace("cr", "chromium")
         display_name = display_name.title()
         display_name = display_name.replace("Ews", "EWS")
         return display_name
index 2a6bd70..654c8a6 100644 (file)
@@ -47,6 +47,7 @@ class QueueTest(unittest.TestCase):
 
     def test_short_name(self):
         self._assert_short_name("mac-ews", "Mac")
+        self._assert_short_name("chromium-ews", "Cr-Linux")
         self._assert_short_name("commit-queue", "Commit")
         self._assert_short_name("style-queue", "Style")
 
@@ -55,6 +56,7 @@ class QueueTest(unittest.TestCase):
 
     def test_display_name(self):
         self._assert_display_name("mac-ews", "Mac EWS")
+        self._assert_display_name("chromium-ews", "Chromium Linux EWS")
         self._assert_display_name("commit-queue", "Commit Queue")
         self._assert_display_name("style-queue", "Style Queue")
 
@@ -63,6 +65,7 @@ class QueueTest(unittest.TestCase):
 
     def test_name_with_underscores(self):
         self._assert_name_with_underscores("mac-ews", "mac_ews")
+        self._assert_name_with_underscores("chromium-ews", "chromium_ews")
         self._assert_name_with_underscores("commit-queue", "commit_queue")
 
     def test_style_queue_is_ews(self):