Modified: trunk/Tools/ChangeLog (96540 => 96541)
--- trunk/Tools/ChangeLog 2011-10-03 21:44:10 UTC (rev 96540)
+++ trunk/Tools/ChangeLog 2011-10-03 21:44:17 UTC (rev 96541)
@@ -1,5 +1,17 @@
2011-10-03 David Levin <[email protected]>
+ watchlist: Make watchlist run on a bot.
+ https://bugs.webkit.org/show_bug.cgi?id=68974
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/tool/commands/queues.py: Add the watchlist to the style bot.
+ * Scripts/webkitpy/tool/commands/queues_unittest.py:
+ Change to log what is run so that we can see the style command
+ and the watchlist command being run.
+
+2011-10-03 David Levin <[email protected]>
+
watchlist: Allow specified a bug to attach the watchlist info to.
https://bugs.webkit.org/show_bug.cgi?id=69288
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues.py (96540 => 96541)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2011-10-03 21:44:10 UTC (rev 96540)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2011-10-03 21:44:17 UTC (rev 96541)
@@ -412,6 +412,7 @@
def review_patch(self, patch):
self.run_webkit_patch(["check-style", "--force-clean", "--non-interactive", "--parent-command=style-queue", patch.id()])
+ self.run_webkit_patch(["apply-watchlist-local", patch.bug_id()])
return True
@classmethod
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py (96540 => 96541)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2011-10-03 21:44:10 UTC (rev 96540)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2011-10-03 21:44:17 UTC (rev 96541)
@@ -413,11 +413,15 @@
"begin_work_queue": self._default_begin_work_queue_stderr("style-queue"),
"next_work_item": "",
"should_proceed_with_work_item": "MOCK: update_status: style-queue Checking style\n",
- "process_work_item": "MOCK: update_status: style-queue Pass\nMOCK: release_work_item: style-queue 10000\n",
+ "process_work_item": """MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'check-style', '--force-clean', '--non-interactive', '--parent-command=style-queue', 10000], cwd=/mock-checkout
+MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-watchlist-local', 50000], cwd=/mock-checkout
+MOCK: update_status: style-queue Pass
+MOCK: release_work_item: style-queue 10000\n""",
"handle_unexpected_error": "Mock error message\n",
"handle_script_error": "MOCK: update_status: style-queue ScriptError error message\nMOCK bug comment: bug_id=50000, cc=[]\n--- Begin comment ---\nAttachment 10000 did not pass style-queue:\n\nScriptError error message\n\nIf any of these errors are false positives, please file a bug against check-webkit-style.\n--- End comment ---\n\n",
}
expected_exceptions = {
"handle_script_error": SystemExit,
}
- self.assert_queue_outputs(StyleQueue(), expected_stderr=expected_stderr, expected_exceptions=expected_exceptions)
+ tool = MockTool(log_executive=True)
+ self.assert_queue_outputs(StyleQueue(), expected_stderr=expected_stderr, expected_exceptions=expected_exceptions, tool=tool)
