Diff
Modified: trunk/Tools/ChangeLog (94977 => 94978)
--- trunk/Tools/ChangeLog 2011-09-12 21:05:29 UTC (rev 94977)
+++ trunk/Tools/ChangeLog 2011-09-12 21:11:32 UTC (rev 94978)
@@ -1,5 +1,25 @@
2011-09-12 Eric Seidel <e...@webkit.org>
+ Rubber-stamped by Adam Barth.
+
+ Remove the "the tree is burning!" warning previously shown
+ when landing patches. It was a dream. But it's just noise now.
+
+ Some bots will require a restart to notice the removal of the option
+ so I've left the --ignore-builders option in for now.
+
+ * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
+ * Scripts/webkitpy/tool/bot/patchanalysistask.py:
+ * Scripts/webkitpy/tool/commands/download.py:
+ * Scripts/webkitpy/tool/commands/download_unittest.py:
+ * Scripts/webkitpy/tool/commands/queues_unittest.py:
+ * Scripts/webkitpy/tool/steps/__init__.py:
+ * Scripts/webkitpy/tool/steps/commit.py:
+ * Scripts/webkitpy/tool/steps/ensurebuildersaregreen.py: Removed.
+ * Scripts/webkitpy/tool/steps/postdiffforrevert.py:
+
+2011-09-12 Eric Seidel <e...@webkit.org>
+
[NRWT] REGRESSION: Local loader tests are failing on machines that lost /tmp/LayoutTests symlink
https://bugs.webkit.org/show_bug.cgi?id=65781
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py (94977 => 94978)
--- trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py 2011-09-12 21:05:29 UTC (rev 94977)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py 2011-09-12 21:11:32 UTC (rev 94978)
@@ -137,7 +137,7 @@
command_passed: success_message='Built patch' patch='197'
run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
command_passed: success_message='Passed tests' patch='197'
-run_webkit_patch: ['land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 197]
+run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 197]
command_passed: success_message='Landed patch' patch='197'
"""
self._run_through_task(commit_queue, expected_stderr)
@@ -244,7 +244,7 @@
run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
command_passed: success_message='Passed tests' patch='197'
report_flaky_tests: patch='197' flaky_tests='[]' archive='mock-archive-197.zip'
-run_webkit_patch: ['land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 197]
+run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 197]
command_passed: success_message='Landed patch' patch='197'
"""
self._run_through_task(commit_queue, expected_stderr)
@@ -273,7 +273,7 @@
command_failed: failure_message='Patch does not pass tests' script_error='MOCK tests failure' patch='197'
run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
command_passed: success_message='Passed tests' patch='197'
-run_webkit_patch: ['land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 197]
+run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 197]
command_passed: success_message='Landed patch' patch='197'
"""
self._run_through_task(commit_queue, expected_stderr)
@@ -375,7 +375,7 @@
archive_last_layout_test_results: patch='197'
run_webkit_patch: ['build-and-test', '--force-clean', '--no-update', '--build', '--test', '--non-interactive']
command_failed: failure_message='Unable to pass tests without patch (tree is red?)' script_error='MOCK clean test failure' patch='197'
-run_webkit_patch: ['land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 197]
+run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 197]
command_passed: success_message='Landed patch' patch='197'
"""
self._run_through_task(commit_queue, expected_stderr)
@@ -474,7 +474,7 @@
command_passed: success_message='Built patch' patch='197'
run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
command_passed: success_message='Passed tests' patch='197'
-run_webkit_patch: ['land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 197]
+run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 197]
command_failed: failure_message='Unable to land patch' script_error='MOCK land failure' patch='197'
"""
# FIXME: This should really be expect_retry=True for a better user experiance.
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py (94977 => 94978)
--- trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py 2011-09-12 21:05:29 UTC (rev 94977)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py 2011-09-12 21:11:32 UTC (rev 94978)
@@ -163,7 +163,6 @@
return self._run_command([
"land-attachment",
"--force-clean",
- "--ignore-builders",
"--non-interactive",
"--parent-command=" + self._delegate.parent_command(),
self._patch.id(),
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/download.py (94977 => 94978)
--- trunk/Tools/Scripts/webkitpy/tool/commands/download.py 2011-09-12 21:05:29 UTC (rev 94977)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/download.py 2011-09-12 21:11:32 UTC (rev 94978)
@@ -92,7 +92,6 @@
argument_names = "[BUGID]"
show_in_main_help = True
steps = [
- steps.EnsureBuildersAreGreen,
steps.UpdateChangeLogsWithReviewer,
steps.ValidateReviewer,
steps.ValidateChangeLogs, # We do this after UpdateChangeLogsWithReviewer to avoid not having to cache the diff twice.
@@ -252,9 +251,6 @@
class AbstractPatchLandingCommand(AbstractPatchSequencingCommand):
- prepare_steps = [
- steps.EnsureBuildersAreGreen,
- ]
main_steps = [
steps.CleanWorkingDirectory,
steps.Update,
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py (94977 => 94978)
--- trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py 2011-09-12 21:05:29 UTC (rev 94977)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py 2011-09-12 21:11:32 UTC (rev 94978)
@@ -71,7 +71,6 @@
options = MockOptions()
options.build = True
options.build_style = True
- options.check_builders = True
options.check_style = True
options.clean = True
options.close_bug = True
@@ -117,7 +116,7 @@
self.assertEqual(mock_tool.checkout().modified_changelogs.call_count, 1)
def test_land_red_builders(self):
- expected_stderr = '\nWARNING: Builders ["Builder2"] are red, please watch your commit carefully.\nSee http://build.webkit.org/console?category=core\n\nBuilding WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning Bindings tests\nRunning _javascript_Core tests\nRunning run-webkit-tests\nCommitted r49824: <http://trac.webkit.org/changeset/49824>\nUpdating bug 42\n'
+ expected_stderr = 'Building WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning Bindings tests\nRunning _javascript_Core tests\nRunning run-webkit-tests\nCommitted r49824: <http://trac.webkit.org/changeset/49824>\nUpdating bug 42\n'
mock_tool = MockTool()
mock_tool.buildbot.light_tree_on_fire()
self.assert_execute_outputs(Land(), [42], options=self._default_options(), expected_stderr=expected_stderr, tool=mock_tool)
@@ -198,7 +197,7 @@
If you would like to land the rollout faster, you can use the following command:
- webkit-patch land-attachment ATTACHMENT_ID --ignore-builders
+ webkit-patch land-attachment ATTACHMENT_ID
where ATTACHMENT_ID is the ID of this attachment.
-- End comment --
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py (94977 => 94978)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2011-09-12 21:05:29 UTC (rev 94977)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2011-09-12 21:11:32 UTC (rev 94978)
@@ -298,7 +298,7 @@
MOCK: update_status: commit-queue Built patch
MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive'], cwd=/mock-checkout
MOCK: update_status: commit-queue Passed tests
-MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 197], cwd=/mock-checkout
+MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 197], cwd=/mock-checkout
MOCK: update_status: commit-queue Landed patch
MOCK: update_status: commit-queue Pass
MOCK: release_work_item: commit-queue 197
@@ -323,7 +323,7 @@
MOCK: update_status: commit-queue Updated working directory
MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--no-update', '--non-interactive', 106], cwd=/mock-checkout
MOCK: update_status: commit-queue Applied patch
-MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 106], cwd=/mock-checkout
+MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 106], cwd=/mock-checkout
MOCK: update_status: commit-queue Landed patch
MOCK: update_status: commit-queue Pass
MOCK: release_work_item: commit-queue 106
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/__init__.py (94977 => 94978)
--- trunk/Tools/Scripts/webkitpy/tool/steps/__init__.py 2011-09-12 21:05:29 UTC (rev 94977)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/__init__.py 2011-09-12 21:11:32 UTC (rev 94978)
@@ -41,7 +41,6 @@
from webkitpy.tool.steps.confirmdiff import ConfirmDiff
from webkitpy.tool.steps.createbug import CreateBug
from webkitpy.tool.steps.editchangelog import EditChangeLog
-from webkitpy.tool.steps.ensurebuildersaregreen import EnsureBuildersAreGreen
from webkitpy.tool.steps.ensurelocalcommitifneeded import EnsureLocalCommitIfNeeded
from webkitpy.tool.steps.obsoletepatches import ObsoletePatches
from webkitpy.tool.steps.options import Options
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/commit.py (94977 => 94978)
--- trunk/Tools/Scripts/webkitpy/tool/steps/commit.py 2011-09-12 21:05:29 UTC (rev 94977)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/commit.py 2011-09-12 21:11:32 UTC (rev 94978)
@@ -36,6 +36,14 @@
class Commit(AbstractStep):
+ # FIXME: This option exists only to make sure we don't break scripts which include --ignore-builders
+ # You can safely delete this option any time after 11/01/11.
+ @classmethod
+ def options(cls):
+ return AbstractStep.options() + [
+ Options.check_builders,
+ ]
+
def _commit_warning(self, error):
working_directory_message = "" if error.working_directory_is_clean else " and working copy changes"
return ('There are %s local commits%s. Everything will be committed as a single commit. '
Deleted: trunk/Tools/Scripts/webkitpy/tool/steps/ensurebuildersaregreen.py (94977 => 94978)
--- trunk/Tools/Scripts/webkitpy/tool/steps/ensurebuildersaregreen.py 2011-09-12 21:05:29 UTC (rev 94977)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/ensurebuildersaregreen.py 2011-09-12 21:11:32 UTC (rev 94978)
@@ -1,49 +0,0 @@
-# Copyright (C) 2010 Google Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from webkitpy.tool.steps.abstractstep import AbstractStep
-from webkitpy.tool.steps.options import Options
-import webkitpy.common.config.urls as config_urls
-from webkitpy.common.system.deprecated_logging import log, error
-
-
-class EnsureBuildersAreGreen(AbstractStep):
- @classmethod
- def options(cls):
- return AbstractStep.options() + [
- Options.check_builders,
- ]
-
- def run(self, state):
- if not self._options.check_builders:
- return
- red_builders_names = self._tool.buildbot.red_core_builders_names()
- if not red_builders_names:
- return
- red_builders_names = map(lambda name: "\"%s\"" % name, red_builders_names) # Add quotes around the names.
- log("\nWARNING: Builders [%s] are red, please watch your commit carefully.\nSee %s/console?category=core\n" % (", ".join(red_builders_names), config_urls.buildbot_url))
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/options.py (94977 => 94978)
--- trunk/Tools/Scripts/webkitpy/tool/steps/options.py 2011-09-12 21:05:29 UTC (rev 94977)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/options.py 2011-09-12 21:11:32 UTC (rev 94978)
@@ -33,7 +33,7 @@
build = make_option("--build", action="" dest="build", default=False, help="Build and run run-webkit-tests before committing.")
build_style = make_option("--build-style", action="" dest="build_style", default=None, help="Whether to build debug, release, or both.")
cc = make_option("--cc", action="" type="string", dest="cc", help="Comma-separated list of email addresses to carbon-copy.")
- check_builders = make_option("--ignore-builders", action="" dest="check_builders", default=True, help="Don't check to see if the build.webkit.org builders are green before landing.")
+ check_builders = make_option("--ignore-builders", action="" dest="check_builders", default=True, help="DEPRECATED: Will be removed any time after 11/01/11.")
check_style = make_option("--ignore-style", action="" dest="check_style", default=True, help="Don't check to see if the patch has proper style before uploading.")
clean = make_option("--no-clean", action="" dest="clean", default=True, help="Don't check if the working directory is clean before applying patches")
close_bug = make_option("--no-close", action="" dest="close_bug", default=True, help="Leave bug open after landing.")
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/postdiffforrevert.py (94977 => 94978)
--- trunk/Tools/Scripts/webkitpy/tool/steps/postdiffforrevert.py 2011-09-12 21:05:29 UTC (rev 94977)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/postdiffforrevert.py 2011-09-12 21:11:32 UTC (rev 94978)
@@ -38,7 +38,7 @@
successful. This process takes approximately 15 minutes.\n\n\
If you would like to land the rollout faster, you can use the \
following command:\n\n\
- webkit-patch land-attachment ATTACHMENT_ID --ignore-builders\n\n\
+ webkit-patch land-attachment ATTACHMENT_ID\n\n\
where ATTACHMENT_ID is the ID of this attachment."
self._tool.bugs.add_patch_to_bug(
state["bug_id"],
