Diff
Modified: trunk/Tools/ChangeLog (148351 => 148352)
--- trunk/Tools/ChangeLog 2013-04-13 07:56:31 UTC (rev 148351)
+++ trunk/Tools/ChangeLog 2013-04-13 08:02:31 UTC (rev 148352)
@@ -1,3 +1,30 @@
+2013-04-13 Ryosuke Niwa <[email protected]>
+
+ Remove more Chromium specific code from webkitpy
+ https://bugs.webkit.org/show_bug.cgi?id=114552
+
+ Reviewed by Philippe Normand.
+
+ * Scripts/webkitpy/common/host.py:
+ (Host.checkout):
+ * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
+ (JSONResultsGeneratorBase):
+ (JSONResultsGeneratorBase.__init__):
+ (JSONResultsGeneratorBase._is_results_all_of_type):
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ (Port):
+ (Port.expected_filename):
+ * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+ (PerfTestsRunner._parse_args):
+ * Scripts/webkitpy/tool/commands/queues.py:
+ (PatchProcessingQueue._new_port_name_from_old):
+ (CommitQueue.did_pass_testing_ews):
+ * Scripts/webkitpy/tool/commands/rebaseline.py:
+ (RebaselineTest._results_url):
+ (Rebaseline._builder_with_name):
+ * Scripts/webkitpy/tool/mocktool.py:
+ (MockTool.irc):
+
2013-04-13 Zan Dobersek <[email protected]>
Fix flakiness dashboard unit test failures
Modified: trunk/Tools/Scripts/webkitpy/common/host.py (148351 => 148352)
--- trunk/Tools/Scripts/webkitpy/common/host.py 2013-04-13 07:56:31 UTC (rev 148351)
+++ trunk/Tools/Scripts/webkitpy/common/host.py 2013-04-13 08:02:31 UTC (rev 148352)
@@ -89,11 +89,6 @@
def checkout(self):
return self._checkout
- def buildbot_for_builder_name(self, name):
- if self.port_factory.get_from_builder_name(name).is_chromium():
- return self.chromium_buildbot()
- return self.buildbot
-
@memoized
def watch_list(self):
return WatchListLoader(self.filesystem).load()
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py (148351 => 148352)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py 2013-04-13 07:56:31 UTC (rev 148351)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py 2013-04-13 08:02:31 UTC (rev 148352)
@@ -188,16 +188,12 @@
URL_FOR_TEST_LIST_JSON = "http://%s/testfile?builder=%s&name=%s&testlistjson=1&testtype=%s&master=%s"
- # FIXME: Remove generate_incremental_results once the reference to it in
- # http://src.chromium.org/viewvc/chrome/trunk/tools/build/scripts/slave/gtest_slave_utils.py
- # has been removed.
def __init__(self, port, builder_name, build_name, build_number,
results_file_base_path, builder_base_url,
test_results_map, svn_repositories=None,
test_results_server=None,
test_type="",
- master_name="",
- generate_incremental_results=None):
+ master_name=""):
"""Modifies the results.json file. Grabs it off the archive directory
if it is not found locally.
@@ -645,8 +641,3 @@
"""Returns whether all the results are of the given type
(e.g. all passes)."""
return len(results) == 1 and results[0][1] == type
-
-
-# Left here not to break anything.
-class JSONResultsGenerator(JSONResultsGeneratorBase):
- pass
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (148351 => 148352)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2013-04-13 07:56:31 UTC (rev 148351)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2013-04-13 08:02:31 UTC (rev 148352)
@@ -73,8 +73,7 @@
"""Abstract class for Port-specific hooks for the layout_test package."""
# Subclasses override this. This should indicate the basic implementation
- # part of the port name, e.g., 'chromium-mac', 'win', 'gtk'; there is probably (?)
- # one unique value per class.
+ # part of the port name, e.g., 'win', 'gtk'; there is probably (?) one unique value per class.
# FIXME: We should probably rename this to something like 'implementation_name'.
port_name = None
@@ -485,8 +484,7 @@
suffix: file suffix of the expected results, including dot; e.g. '.txt'
or '.png'. This should not be None, but may be an empty string.
platform: the most-specific directory name to use to build the
- search list of directories, e.g., 'chromium-win', or
- 'chromium-cg-mac-leopard' (we follow the WebKit format)
+ search list of directories; e.g. 'mountainlion-wk2'
return_default: if True, returns the path to the generic expectation if nothing
else is found; if False, returns None.
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py (148351 => 148352)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2013-04-13 07:56:31 UTC (rev 148351)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2013-04-13 08:02:31 UTC (rev 148352)
@@ -84,10 +84,6 @@
help='Set the configuration to Release'),
optparse.make_option("--platform",
help="Specify port/platform being tested (i.e. chromium-mac)"),
- optparse.make_option("--chromium",
- action="" const='chromium', dest='platform', help='Alias for --platform=chromium'),
- optparse.make_option("--chromium-android",
- action="" const='chromium-android', dest='platform', help='Alias for --platform=chromium-android'),
optparse.make_option("--builder-name",
help=("The name of the builder shown on the waterfall running this script e.g. google-mac-2.")),
optparse.make_option("--build-number",
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues.py (148351 => 148352)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2013-04-13 07:56:31 UTC (rev 148351)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2013-04-13 08:02:31 UTC (rev 148352)
@@ -261,9 +261,6 @@
# FIXME: This is a hack to map between the old port names and the new port names.
def _new_port_name_from_old(self, port_name, platform):
- # The new port system has no concept of xvfb yet.
- if port_name == 'chromium-xvfb':
- return 'chromium'
# ApplePort.determine_full_port_name asserts if the name doesn't include version.
if port_name == 'mac':
return 'mac-' + platform.os_version
@@ -381,9 +378,9 @@
reporter.report_flaky_tests(patch, flaky_test_results, results_archive)
def did_pass_testing_ews(self, patch):
- # Currently, chromium-ews is the only testing EWS. Once there are more,
- # should make sure they all pass.
- status = self._tool.status_server.patch_status("chromium-ews", patch.id())
+ # Only Mac and Mac WK2 run tests
+ # FIXME: We shouldn't have to hard-code it here.
+ status = self._tool.status_server.patch_status("mac", patch.id())
return status == self._pass_status
# StepSequenceErrorHandler methods
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py (148351 => 148352)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py 2013-04-13 07:56:31 UTC (rev 148351)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py 2013-04-13 08:02:31 UTC (rev 148352)
@@ -88,7 +88,7 @@
self._scm_changes = {'add': []}
def _results_url(self, builder_name):
- return self._tool.buildbot_for_builder_name(builder_name).builder_with_name(builder_name).latest_layout_test_results_url()
+ return self._tool.buildbot.builder_with_name(builder_name).latest_layout_test_results_url()
def _baseline_directory(self, builder_name):
port = self._tool.port_factory.get_from_builder_name(builder_name)
@@ -465,7 +465,7 @@
return [self._builder_with_name(name) for name in chosen_names]
def _builder_with_name(self, name):
- return self._tool.buildbot_for_builder_name(name).builder_with_name(name)
+ return self._tool.buildbot.builder_with_name(name)
def _tests_to_update(self, builder):
failing_tests = builder.latest_layout_test_results().tests_matching_failure_types([test_failures.FailureTextMismatch])
Modified: trunk/Tools/Scripts/webkitpy/tool/mocktool.py (148351 => 148352)
--- trunk/Tools/Scripts/webkitpy/tool/mocktool.py 2013-04-13 07:56:31 UTC (rev 148351)
+++ trunk/Tools/Scripts/webkitpy/tool/mocktool.py 2013-04-13 08:02:31 UTC (rev 148352)
@@ -83,6 +83,3 @@
def irc(self):
return self._irc
-
- def buildbot_for_builder_name(self, name):
- return MockBuildBot()
