Diff
Modified: trunk/Tools/ChangeLog (138774 => 138775)
--- trunk/Tools/ChangeLog 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/ChangeLog 2013-01-04 03:56:32 UTC (rev 138775)
@@ -1,3 +1,53 @@
+2013-01-03 Eric Seidel <e...@webkit.org>
+
+ Rename Tool.port to deprecated_port in preparation for removing more callers
+ https://bugs.webkit.org/show_bug.cgi?id=106076
+
+ Reviewed by Ryosuke Niwa.
+
+ This resolves a long-standing FIXME to rename this method. :)
+
+ * Scripts/webkitpy/tool/bot/botinfo.py:
+ (BotInfo.summary_text):
+ * Scripts/webkitpy/tool/bot/irc_command.py:
+ (Rollout._update_working_copy):
+ * Scripts/webkitpy/tool/bot/layouttestresultsreader.py:
+ (LayoutTestResultsReader._create_layout_test_results):
+ (LayoutTestResultsReader._create_unit_test_results):
+ (LayoutTestResultsReader._results_directory):
+ * Scripts/webkitpy/tool/bot/layouttestresultsreader_unittest.py:
+ (test_missing_unit_test_results_path):
+ * Scripts/webkitpy/tool/main.py:
+ (WebKitPatch.deprecated_port):
+ * Scripts/webkitpy/tool/mocktool.py:
+ (MockTool.deprecated_port):
+ * Scripts/webkitpy/tool/steps/build.py:
+ (Build.build):
+ * Scripts/webkitpy/tool/steps/checkstyle.py:
+ (CheckStyle.run):
+ * Scripts/webkitpy/tool/steps/commit.py:
+ (Commit._check_test_expectations):
+ * Scripts/webkitpy/tool/steps/preparechangelog.py:
+ (PrepareChangeLog.run):
+ * Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py:
+ (PrepareChangeLogForDEPSRoll.run):
+ * Scripts/webkitpy/tool/steps/preparechangelogforrevert.py:
+ (PrepareChangeLogForRevert.run):
+ * Scripts/webkitpy/tool/steps/runtests.py:
+ (RunTests.run):
+ * Scripts/webkitpy/tool/steps/steps_unittest.py:
+ (StepsTest.test_runtests_args):
+ * Scripts/webkitpy/tool/steps/update.py:
+ (Update._update_command):
+
+2013-01-03 Eric Seidel <e...@webkit.org>
+
+ Add myself to the webkitpy watchlist.
+
+ Unreviewed.
+
+ * Scripts/webkitpy/common/config/watchlist:
+
2013-01-03 Ryosuke Niwa <rn...@webkit.org>
Cleanup perftest* tests and add a test for computing statistics
Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/common/config/watchlist 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist 2013-01-04 03:56:32 UTC (rev 138775)
@@ -393,7 +393,7 @@
"WebSocket": [ "yu...@chromium.org" ],
"XSS": [ "dba...@webkit.org", "ojan.aut...@gmail.com" ],
"webkitperl": [ "dba...@webkit.org" ],
- "webkitpy": [ "aba...@webkit.org", "dpra...@chromium.org" ],
+ "webkitpy": [ "aba...@webkit.org", "dpra...@chromium.org", "e...@webkit.org" ],
},
"MESSAGE_RULES": {
"ChromiumPublicApi": [ "Please wait for approval from aba...@webkit.org, dglaz...@chromium.org, "
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/botinfo.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/bot/botinfo.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/botinfo.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -36,4 +36,4 @@
# bot_id is also stored on the options dictionary on the tool.
bot_id = self._tool.status_server.bot_id
bot_id_string = "Bot: %s " % (bot_id) if bot_id else ""
- return "%sPort: %s Platform: %s" % (bot_id_string, self._tool.port().name(), self._tool.platform.display_name())
+ return "%sPort: %s Platform: %s" % (bot_id_string, self._tool.deprecated_port().name(), self._tool.platform.display_name())
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -112,7 +112,7 @@
def _update_working_copy(self, tool):
tool.scm().ensure_clean_working_directory(force_clean=True)
- tool.executive.run_and_throw_if_fail(tool.port().update_webkit_command(), quiet=True, cwd=tool.scm().checkout_root)
+ tool.executive.run_and_throw_if_fail(tool.deprecated_port().update_webkit_command(), quiet=True, cwd=tool.scm().checkout_root)
def execute(self, nick, args, tool, sheriff):
svn_revision_list, rollout_reason = self._parse_args(args)
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/layouttestresultsreader.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/bot/layouttestresultsreader.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/layouttestresultsreader.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -50,14 +50,14 @@
# FIXME: This logic should move to the port object.
def _create_layout_test_results(self):
- results_path = self._tool.port().layout_tests_results_path()
+ results_path = self._tool.deprecated_port().layout_tests_results_path()
results_html = self._read_file_contents(results_path)
if not results_html:
return None
return LayoutTestResults.results_from_string(results_html)
def _create_unit_test_results(self):
- results_path = self._tool.port().unit_tests_results_path()
+ results_path = self._tool.deprecated_port().unit_tests_results_path()
if not results_path:
return None
results_xml = self._read_file_contents(results_path)
@@ -79,7 +79,7 @@
return layout_test_results
def _results_directory(self):
- results_path = self._tool.port().layout_tests_results_path()
+ results_path = self._tool.deprecated_port().layout_tests_results_path()
# FIXME: This is wrong in two ways:
# 1. It assumes that results.html is at the top level of the results tree.
# 2. This uses the "old" ports.py infrastructure instead of the new layout_tests/port
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/layouttestresultsreader_unittest.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/bot/layouttestresultsreader_unittest.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/layouttestresultsreader_unittest.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -66,7 +66,7 @@
def test_missing_unit_test_results_path(self):
tool = MockTool()
- tool.port().unit_tests_results_path = lambda: None
+ tool.deprecated_port().unit_tests_results_path = lambda: None
reader = LayoutTestResultsReader(tool, "/var/logs")
reader._create_layout_test_results = lambda: LayoutTestResults([])
# layout_test_results shouldn't raise even if the unit tests xml file is missing.
Modified: trunk/Tools/Scripts/webkitpy/tool/main.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/main.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/main.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -61,8 +61,7 @@
self._irc = None
self._deprecated_port = None
- # FIXME: Rename this deprecated_port()
- def port(self):
+ def deprecated_port(self):
return self._deprecated_port
def path(self):
Modified: trunk/Tools/Scripts/webkitpy/tool/mocktool.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/mocktool.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/mocktool.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -71,7 +71,7 @@
self.irc_password = "MOCK irc password"
self.wakeup_event = threading.Event()
- def port(self):
+ def deprecated_port(self):
return self._deprecated_port
def path(self):
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/build.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/steps/build.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/build.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -48,7 +48,7 @@
environment.disable_gcc_smartquotes()
env = environment.to_dictionary()
- build_webkit_command = self._tool.port().build_webkit_command(build_style=build_style)
+ build_webkit_command = self._tool.deprecated_port().build_webkit_command(build_style=build_style)
self._tool.executive.run_and_throw_if_fail(build_webkit_command, self._options.quiet,
cwd=self._tool.scm().checkout_root, env=env)
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/checkstyle.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/steps/checkstyle.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/checkstyle.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -57,7 +57,7 @@
args.append(self._options.check_style_filter)
try:
- self._tool.executive.run_and_throw_if_fail(self._tool.port().check_webkit_style_command() + args, cwd=self._tool.scm().checkout_root)
+ self._tool.executive.run_and_throw_if_fail(self._tool.deprecated_port().check_webkit_style_command() + args, cwd=self._tool.scm().checkout_root)
except ScriptError, e:
if self._options.non_interactive:
# We need to re-raise the exception here to have the
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/commit.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/steps/commit.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/commit.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -60,7 +60,7 @@
args = ["--diff-files"]
args.extend(test_expectations_files)
try:
- self._tool.executive.run_and_throw_if_fail(self._tool.port().check_webkit_style_command() + args, cwd=self._tool.scm().checkout_root)
+ self._tool.executive.run_and_throw_if_fail(self._tool.deprecated_port().check_webkit_style_command() + args, cwd=self._tool.scm().checkout_root)
except ScriptError, e:
if self._options.non_interactive:
raise
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -62,7 +62,7 @@
if self.cached_lookup(state, "changelogs"):
self._ensure_bug_url(state)
return
- args = self._tool.port().prepare_changelog_command()
+ args = self._tool.deprecated_port().prepare_changelog_command()
if state.get("bug_id"):
args.append("--bug=%s" % state["bug_id"])
args.append("--description=%s" % self.cached_lookup(state, 'bug_title'))
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -32,7 +32,7 @@
class PrepareChangeLogForDEPSRoll(AbstractStep):
def run(self, state):
- self._tool.executive.run_and_throw_if_fail(self._tool.port().prepare_changelog_command())
+ self._tool.executive.run_and_throw_if_fail(self._tool.deprecated_port().prepare_changelog_command())
changelog_paths = self._tool.checkout().modified_changelogs(git_commit=None)
for changelog_path in changelog_paths:
ChangeLog(changelog_path).update_with_unreviewed_message("Unreviewed. Rolled DEPS.\n\n")
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -48,7 +48,7 @@
def run(self, state):
# This could move to prepare-ChangeLog by adding a --revert= option.
- self._tool.executive.run_and_throw_if_fail(self._tool.port().prepare_changelog_command(), cwd=self._tool.scm().checkout_root)
+ self._tool.executive.run_and_throw_if_fail(self._tool.deprecated_port().prepare_changelog_command(), cwd=self._tool.scm().checkout_root)
changelog_paths = self._tool.checkout().modified_changelogs(git_commit=None)
bug_url = self._tool.bugs.bug_url_for_bug_id(state["bug_id"]) if state["bug_id"] else None
message = self._message_for_revert(state["revision_list"], state["reason"], bug_url)
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -53,41 +53,41 @@
if not self._options.non_interactive:
# FIXME: We should teach the commit-queue and the EWS how to run these tests.
- python_unittests_command = self._tool.port().run_python_unittests_command()
+ python_unittests_command = self._tool.deprecated_port().run_python_unittests_command()
if python_unittests_command:
_log.info("Running Python unit tests")
self._tool.executive.run_and_throw_if_fail(python_unittests_command, cwd=self._tool.scm().checkout_root)
- perl_unittests_command = self._tool.port().run_perl_unittests_command()
+ perl_unittests_command = self._tool.deprecated_port().run_perl_unittests_command()
if perl_unittests_command:
_log.info("Running Perl unit tests")
self._tool.executive.run_and_throw_if_fail(perl_unittests_command, cwd=self._tool.scm().checkout_root)
- _javascript_core_tests_command = self._tool.port().run_javascriptcore_tests_command()
+ _javascript_core_tests_command = self._tool.deprecated_port().run_javascriptcore_tests_command()
if _javascript_core_tests_command:
_log.info("Running _javascript_Core tests")
self._tool.executive.run_and_throw_if_fail(_javascript_core_tests_command, quiet=True, cwd=self._tool.scm().checkout_root)
- webkit_unit_tests_command = self._tool.port().run_webkit_unit_tests_command()
+ webkit_unit_tests_command = self._tool.deprecated_port().run_webkit_unit_tests_command()
if webkit_unit_tests_command:
_log.info("Running WebKit unit tests")
args = webkit_unit_tests_command
if self._options.non_interactive:
- args.append("--gtest_output=xml:%s/webkit_unit_tests_output.xml" % self._tool.port().results_directory)
+ args.append("--gtest_output=xml:%s/webkit_unit_tests_output.xml" % self._tool.deprecated_port().results_directory)
try:
self._tool.executive.run_and_throw_if_fail(args, cwd=self._tool.scm().checkout_root)
except ScriptError, e:
_log.info("Error running webkit_unit_tests: %s" % e.message_with_output())
_log.info("Running run-webkit-tests")
- args = self._tool.port().run_webkit_tests_command()
+ args = self._tool.deprecated_port().run_webkit_tests_command()
if self._options.non_interactive:
args.extend([
"--no-new-test-results",
"--no-show-results",
"--skip-failing-tests",
"--exit-after-n-failures=%s" % self.NON_INTERACTIVE_FAILURE_LIMIT_COUNT,
- "--results-directory=%s" % self._tool.port().results_directory,
+ "--results-directory=%s" % self._tool.deprecated_port().results_directory,
"--quiet",
])
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -99,10 +99,9 @@
mock_options = self._step_options()
mock_options.non_interactive = False
step = steps.RunTests(MockTool(log_executive=True), mock_options)
- # FIXME: We shouldn't use a real port-object here, but there is too much to mock at the moment.
- mock_port = DeprecatedPort()
tool = MockTool(log_executive=True)
- tool.port = lambda: mock_port
+ # FIXME: We shouldn't use a real port-object here, but there is too much to mock at the moment.
+ tool._deprecated_port = DeprecatedPort()
step = steps.RunTests(tool, mock_options)
expected_logs = """Running Python unit tests
MOCK run_and_throw_if_fail: ['Tools/Scripts/test-webkitpy'], cwd=/mock-checkout
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/update.py (138774 => 138775)
--- trunk/Tools/Scripts/webkitpy/tool/steps/update.py 2013-01-04 03:46:06 UTC (rev 138774)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/update.py 2013-01-04 03:56:32 UTC (rev 138775)
@@ -50,5 +50,5 @@
self._tool.executive.run_and_throw_if_fail(self._update_command(), quiet=self._options.quiet, cwd=self._tool.scm().checkout_root)
def _update_command(self):
- update_command = self._tool.port().update_webkit_command(self._options.non_interactive)
+ update_command = self._tool.deprecated_port().update_webkit_command(self._options.non_interactive)
return update_command
