Modified: trunk/Tools/ChangeLog (124353 => 124354)
--- trunk/Tools/ChangeLog 2012-08-01 19:03:14 UTC (rev 124353)
+++ trunk/Tools/ChangeLog 2012-08-01 19:05:55 UTC (rev 124354)
@@ -1,3 +1,19 @@
+2012-08-01 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r123865.
+ http://trac.webkit.org/changeset/123865
+ https://bugs.webkit.org/show_bug.cgi?id=92891
+
+ This patch is causing the style-queue to fall behind
+ (Requested by abarth on #webkit).
+
+ * Scripts/webkitpy/tool/commands/queues.py:
+ (AbstractReviewQueue.begin_work_queue):
+ (StyleQueue.__init__):
+ * Scripts/webkitpy/tool/commands/queues_unittest.py:
+ (StyleQueueTest.test_style_queue_with_style_exception):
+ (test_style_queue_with_watch_list_exception):
+
2012-08-01 Ryosuke Niwa <rn...@webkit.org>
run-perf-tests throws an exception when the output json is malformed
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues.py (124353 => 124354)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2012-08-01 19:03:14 UTC (rev 124353)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2012-08-01 19:05:55 UTC (rev 124354)
@@ -379,6 +379,9 @@
# AbstractPatchQueue methods
+ def begin_work_queue(self):
+ AbstractPatchQueue.begin_work_queue(self)
+
def next_work_item(self):
return self._next_patch()
@@ -413,23 +416,6 @@
def __init__(self):
AbstractReviewQueue.__init__(self)
- def begin_work_queue(self):
- AbstractReviewQueue.begin_work_queue(self)
- self.clean_bugzilla()
-
- def clean_bugzilla(self):
- try:
- self._update_status("Cleaning review queue")
- self.run_webkit_patch(["clean-review-queue"])
- except ScriptError, e:
- self._update_status(e)
-
- try:
- self._update_status("Cleaning pending commit")
- self.run_webkit_patch(["clean-pending-commit"])
- except ScriptError, e:
- self._update_status(e)
-
def review_patch(self, patch):
task = StyleQueueTask(self, patch)
if not task.validate():
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py (124353 => 124354)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2012-08-01 19:03:14 UTC (rev 124353)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2012-08-01 19:05:55 UTC (rev 124354)
@@ -449,11 +449,7 @@
class StyleQueueTest(QueuesTest):
def test_style_queue_with_style_exception(self):
expected_stderr = {
- "begin_work_queue": self._default_begin_work_queue_stderr("style-queue") + """MOCK: update_status: style-queue Cleaning review queue
-MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'clean-review-queue'], cwd=/mock-checkout
-MOCK: update_status: style-queue Cleaning pending commit
-MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'clean-pending-commit'], cwd=/mock-checkout
-""",
+ "begin_work_queue": self._default_begin_work_queue_stderr("style-queue"),
"next_work_item": "",
"process_work_item": """MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'clean'], cwd=/mock-checkout
MOCK: update_status: style-queue Cleaned working directory
@@ -476,11 +472,7 @@
def test_style_queue_with_watch_list_exception(self):
expected_stderr = {
- "begin_work_queue": self._default_begin_work_queue_stderr("style-queue") + """MOCK: update_status: style-queue Cleaning review queue
-MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'clean-review-queue'], cwd=/mock-checkout
-MOCK: update_status: style-queue Cleaning pending commit
-MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'clean-pending-commit'], cwd=/mock-checkout
-""",
+ "begin_work_queue": self._default_begin_work_queue_stderr("style-queue"),
"next_work_item": "",
"process_work_item": """MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'clean'], cwd=/mock-checkout
MOCK: update_status: style-queue Cleaned working directory
