style-queue logs bogus messages to the QueueStatusServer

https://bugs.webkit.org/show_bug.cgi?id=79424

Reviewed by Eric Seidel.

Copy/paste error.

* Scripts/webkitpy/tool/bot/stylequeuetask.py:
(StyleQueueTask._check_style):
(StyleQueueTask._apply_watch_list):
* Scripts/webkitpy/tool/commands/queues_unittest.py:

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index ea7f1be..29ca241 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2012-02-23  Adam Barth  <abarth@webkit.org>
+
+        style-queue logs bogus messages to the QueueStatusServer
+        https://bugs.webkit.org/show_bug.cgi?id=79424
+
+        Reviewed by Eric Seidel.
+
+        Copy/paste error.
+
+        * Scripts/webkitpy/tool/bot/stylequeuetask.py:
+        (StyleQueueTask._check_style):
+        (StyleQueueTask._apply_watch_list):
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+
 2012-02-23  Eric Seidel  <eric@webkit.org>
 
         Use self._filesystem in more places in the SCM classes

diff --git a/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py b/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py
index 54d6fa2..261e677 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py
+++ b/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py
@@ -46,16 +46,16 @@ class StyleQueueTask(PatchAnalysisTask):
             "--non-interactive",
             self._patch.id(),
         ],
-        "ChangeLog validated",
-        "ChangeLog did not pass validation")
+        "Style checked",
+        "Patch did not pass style check")
 
     def _apply_watch_list(self):
         return self._run_command([
             "apply-watchlist-local",
             self._patch.bug_id(),
         ],
-        "ChangeLog validated",
-        "ChangeLog did not pass validation")
+        "Watchlist applied",
+        "Unabled to apply watchlist")
 
     def run(self):
         if not self._clean():

diff --git a/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py b/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py
index d723ac6..532d7bf 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py
@@ -456,9 +456,9 @@ MOCK: update_status: style-queue Updated working directory
 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--no-update', '--non-interactive', 10000], cwd=/mock-checkout
 MOCK: update_status: style-queue Applied patch
 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-watchlist-local', 50000], cwd=/mock-checkout
-MOCK: update_status: style-queue ChangeLog validated
+MOCK: update_status: style-queue Watchlist applied
 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'check-style', '--no-clean', '--no-update', '--non-interactive', 10000], cwd=/mock-checkout
-MOCK: update_status: style-queue ChangeLog did not pass validation
+MOCK: update_status: style-queue Patch did not pass style check
 MOCK bug comment: bug_id=50000, cc=[]
 --- Begin comment ---
 Attachment 10000 did not pass style-queue:
@@ -489,9 +489,9 @@ MOCK: update_status: style-queue Updated working directory
 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--no-update', '--non-interactive', 10000], cwd=/mock-checkout
 MOCK: update_status: style-queue Applied patch
 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-watchlist-local', 50000], cwd=/mock-checkout
-MOCK: update_status: style-queue ChangeLog did not pass validation
+MOCK: update_status: style-queue Unabled to apply watchlist
 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'check-style', '--no-clean', '--no-update', '--non-interactive', 10000], cwd=/mock-checkout
-MOCK: update_status: style-queue ChangeLog validated
+MOCK: update_status: style-queue Style checked
 MOCK: update_status: style-queue Pass
 MOCK: release_work_item: style-queue 10000
 """,