Diff
Modified: trunk/Tools/ChangeLog (263180 => 263181)
--- trunk/Tools/ChangeLog 2020-06-17 20:23:17 UTC (rev 263180)
+++ trunk/Tools/ChangeLog 2020-06-17 21:29:24 UTC (rev 263181)
@@ -1,5 +1,47 @@
2020-06-17 Aakash Jain <[email protected]>
+ Delete code for old ews bindings queue
+ https://bugs.webkit.org/show_bug.cgi?id=213315
+
+ Rubber-stamped by Alexey Proskuryakov.
+
+ * Scripts/webkitpy/common/config/ews.json:
+ * Scripts/webkitpy/common/config/ports.py:
+ (DeprecatedPort.run_bindings_tests_command): Deleted.
+ (WinPort.run_bindings_tests_command): Deleted.
+ * Scripts/webkitpy/common/config/ports_mock.py:
+ (MockPort.run_bindings_tests_command): Deleted.
+ * Scripts/webkitpy/common/net/generictestresults.py: Removed.
+ * Scripts/webkitpy/common/net/generictestresults_unittest.py: Removed.
+ * Scripts/webkitpy/tool/bot/bindingstestresultsreader.py: Removed.
+ * Scripts/webkitpy/tool/bot/patchanalysistask.py:
+ (PatchAnalysisTask._retry_bindings_tests): Deleted.
+ * Scripts/webkitpy/tool/bot/retrylogic_unittest.py:
+ (MockBindingsEarlyWarningSystem): Deleted.
+ (MockBindingsEarlyWarningSystem.__init__): Deleted.
+ (MockBindingsEarlyWarningSystem.test_results): Deleted.
+ (BindingsEarlyWarningSystemTest): Deleted.
+ (BindingsEarlyWarningSystemTest._results_indicate_all_passed): Deleted.
+ (BindingsEarlyWarningSystemTest._create_task): Deleted.
+ (BindingsEarlyWarningSystemTest.test_success_case): Deleted.
+ (BindingsEarlyWarningSystemTest.test_test_failure): Deleted.
+ (BindingsEarlyWarningSystemTest.test_fix): Deleted.
+ (BindingsEarlyWarningSystemTest.test_ineffective_patch): Deleted.
+ (BindingsEarlyWarningSystemTest.test_partially_effective_patch): Deleted.
+ (BindingsEarlyWarningSystemTest.test_different_test_failures_in_patch_and_tree): Deleted.
+ * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+ * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
+ (TestBindingsEWS): Deleted.
+ (AbstractEarlyWarningSystemTest.test_failing_bindings_tests_message): Deleted.
+ * Scripts/webkitpy/tool/steps/checkpatchrelevance.py:
+ * Scripts/webkitpy/tool/steps/runtests.py:
+ (RunTests._run_bindings_tests): Deleted.
+ * Scripts/webkitpy/tool/steps/steps_unittest.py:
+ (test_patch_relevant_bindings): Deleted.
+ (test_runtests_api): Deleted.
+
+2020-06-17 Aakash Jain <[email protected]>
+
Delete code for old ews style queue
https://bugs.webkit.org/show_bug.cgi?id=213297
Modified: trunk/Tools/Scripts/webkitpy/common/config/ews.json (263180 => 263181)
--- trunk/Tools/Scripts/webkitpy/common/config/ews.json 2020-06-17 20:23:17 UTC (rev 263180)
+++ trunk/Tools/Scripts/webkitpy/common/config/ews.json 2020-06-17 21:29:24 UTC (rev 263181)
@@ -72,13 +72,6 @@
"[email protected]"
]
},
- "Bindings EWS": {
- "port": "mac",
- "name": "bindings-ews",
- "group": "bindings",
- "runTests": true,
- "shouldBuild": false
- },
"WinCairo EWS": {
"port": "wincairo",
"name": "wincairo-ews",
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (263180 => 263181)
--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2020-06-17 20:23:17 UTC (rev 263180)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2020-06-17 21:29:24 UTC (rev 263181)
@@ -131,9 +131,6 @@
def run_perl_unittests_command(self):
return self.script_shell_command("test-webkitperl")
- def run_bindings_tests_command(self):
- return self.script_shell_command("run-bindings-tests")
-
def run_api_tests_command(self, build_style=None):
command = self.script_shell_command("run-api-tests")
return self._append_build_style_flag(command, build_style)
@@ -182,9 +179,6 @@
class WinPort(DeprecatedPort):
port_flag_name = "win"
- def run_bindings_tests_command(self):
- return None
-
def run_webkit_tests_command(self, build_style=None):
command = super(WinPort, self).run_webkit_tests_command(build_style)
command.append("--dump-render-tree")
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports_mock.py (263180 => 263181)
--- trunk/Tools/Scripts/webkitpy/common/config/ports_mock.py 2020-06-17 20:23:17 UTC (rev 263180)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_mock.py 2020-06-17 21:29:24 UTC (rev 263181)
@@ -55,6 +55,3 @@
def run_webkit_tests_command(self, build_style=None):
return ['mock-run-webkit-tests']
-
- def run_bindings_tests_command(self):
- return ['mock-run-bindings-tests']
Deleted: trunk/Tools/Scripts/webkitpy/common/net/generictestresults.py (263180 => 263181)
--- trunk/Tools/Scripts/webkitpy/common/net/generictestresults.py 2020-06-17 20:23:17 UTC (rev 263180)
+++ trunk/Tools/Scripts/webkitpy/common/net/generictestresults.py 2020-06-17 21:29:24 UTC (rev 263181)
@@ -1,63 +0,0 @@
-# Copyright (C) 2017 Apple 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:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. 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.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
-
-import logging
-
-from webkitpy.common.net.abstracttestresults import AbstractTestResults
-
-_log = logging.getLogger(__name__)
-
-
-class GenericTestResults(AbstractTestResults):
- def __init__(self, failures):
- self._failures = failures
-
- @classmethod
- def results_from_string(cls, string):
- parsed_results = cls.parse_json_string(string)
- if not parsed_results:
- return None
-
- if 'failures' not in parsed_results:
- return None
-
- return cls(parsed_results['failures'])
-
- def is_subset(self, other):
- return set(self._failures) <= set(other._failures)
-
- def equals(self, other):
- return set(self._failures) == set(other._failures)
-
- def all_passed(self):
- return not self._failures
-
- def failing_tests(self):
- return self._failures
-
- # No defined failure limit for bindings tests.
- def did_exceed_test_failure_limit(self):
- return False
-
-
-class BindingsTestResults(GenericTestResults):
- pass
Deleted: trunk/Tools/Scripts/webkitpy/common/net/generictestresults_unittest.py (263180 => 263181)
--- trunk/Tools/Scripts/webkitpy/common/net/generictestresults_unittest.py 2020-06-17 20:23:17 UTC (rev 263180)
+++ trunk/Tools/Scripts/webkitpy/common/net/generictestresults_unittest.py 2020-06-17 21:29:24 UTC (rev 263181)
@@ -1,41 +0,0 @@
-# Copyright (C) 2017 Apple 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:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. 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.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
-
-import unittest
-
-from webkitpy.common.net.generictestresults import GenericTestResults
-
-
-class GenericTestResultsTest(unittest.TestCase):
- def test_results_from_string(self):
- incomplete_json = '{"key2": []}'
- self.assertEqual(None, GenericTestResults.results_from_string(incomplete_json))
-
- def test_results_from_string_success(self):
- no_failures_string = '{"failures": []}'
- no_failures_results = GenericTestResults([])
- self.assertTrue(no_failures_results.equals(GenericTestResults.results_from_string(no_failures_string)))
- self.assertTrue(no_failures_results.all_passed())
-
- test_string = '{"failures": ["failure1"]}'
- test_results = GenericTestResults(["failure1"])
- self.assertTrue(test_results.equals(GenericTestResults.results_from_string(test_string)))
Deleted: trunk/Tools/Scripts/webkitpy/tool/bot/bindingstestresultsreader.py (263180 => 263181)
--- trunk/Tools/Scripts/webkitpy/tool/bot/bindingstestresultsreader.py 2020-06-17 20:23:17 UTC (rev 263180)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/bindingstestresultsreader.py 2020-06-17 21:29:24 UTC (rev 263181)
@@ -1,35 +0,0 @@
-# Copyright (C) 2017 Apple 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:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. 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.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
-
-import logging
-
-from webkitpy.common.net.generictestresults import BindingsTestResults
-from webkitpy.tool.bot.abstracttestresultsreader import AbstractTestResultsReader
-
-_log = logging.getLogger(__name__)
-
-
-class BindingsTestResultsReader(AbstractTestResultsReader):
- def results(self):
- results_path = self._host.filesystem.join(self._results_directory, 'bindings_test_results.json')
- contents = self._read_file_contents(results_path)
- return BindingsTestResults.results_from_string(contents)
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py (263180 => 263181)
--- trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py 2020-06-17 20:23:17 UTC (rev 263180)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py 2020-06-17 21:29:24 UTC (rev 263181)
@@ -231,30 +231,6 @@
# also present without the patch, so we don't need to defer.
return False
- def _retry_bindings_tests(self):
- first_results = self._delegate.test_results()
- first_script_error = self._script_error
- first_failure_status_id = self.failure_status_id
- if first_results is None:
- return False
-
- # Some errors are not correctly reported by the run-bindings-tests script
- # https://bugs.webkit.org/show_bug.cgi?id=169449
- # In affected cases, add a message requesting to look at test output instead.
- if not first_results._failures:
- first_results._failures = ["Please see test output for results"]
-
- self._build_and_test_without_patch()
- clean_tree_results = self._delegate.test_results()
- if clean_tree_results is None:
- return False
-
- if first_results.is_subset(clean_tree_results):
- return True
-
- self.failure_status_id = first_failure_status_id
- return self.report_failure(None, first_results, first_script_error)
-
# FIXME: Abstract out common parts of the retry logic.
def _retry_jsc_tests(self):
first_results = self._delegate.test_results()
@@ -358,8 +334,6 @@
if hasattr(self._delegate, 'group') and self._delegate.group() == "jsc":
return self._retry_jsc_tests()
- elif hasattr(self._delegate, 'group') and self._delegate.group() == "bindings":
- return self._retry_bindings_tests()
else:
return self._retry_layout_tests()
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/retrylogic_unittest.py (263180 => 263181)
--- trunk/Tools/Scripts/webkitpy/tool/bot/retrylogic_unittest.py 2020-06-17 20:23:17 UTC (rev 263180)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/retrylogic_unittest.py 2020-06-17 21:29:24 UTC (rev 263181)
@@ -23,7 +23,6 @@
import logging
import unittest
-from webkitpy.common.net.generictestresults import BindingsTestResults
from webkitpy.common.net.jsctestresults import JSCTestResults
from webkitpy.common.system.executive import ScriptError
from webkitpy.tool.bot.patchanalysistask import *
@@ -217,81 +216,3 @@
return_value = task._test_patch()
self.assertTrue(return_value)
self.assertEqual(task.test_run_count(), 3)
-
-
-class MockBindingsEarlyWarningSystem(AbstractEarlyWarningSystem):
- def __init__(self, first_test_results, clean_test_results):
- AbstractEarlyWarningSystem.__init__(self)
- self._group = 'bindings'
- self._results_in_order = [clean_test_results, first_test_results]
-
- def test_results(self):
- return self._results_in_order.pop()
-
-
-class BindingsEarlyWarningSystemTest(unittest.TestCase):
- def _results_indicate_all_passed(self, results):
- if results == None:
- return False
- return results.all_passed()
-
- def _create_task(self, first_test_results, clean_test_results):
- queue = MockBindingsEarlyWarningSystem(first_test_results, clean_test_results)
- tool = MockTool(log_executive=True)
- patch = tool.bugs.fetch_attachment(10000)
- patches_passed_all_tests = [self._results_indicate_all_passed(first_test_results)]
- return MockPatchAnalysisTask(queue, patch, patches_passed_all_tests)
-
- def test_success_case(self):
- first_test_results = BindingsTestResults([])
- clean_test_results = BindingsTestResults([])
- task = self._create_task(first_test_results, clean_test_results)
-
- return_value = task._test_patch()
- self.assertEqual(task.test_run_count(), 1)
- self.assertTrue(return_value)
-
- def test_test_failure(self):
- first_test_results = BindingsTestResults(['TestMapLike.idl'])
- clean_test_results = BindingsTestResults([])
- task = self._create_task(first_test_results, clean_test_results)
-
- with self.assertRaises(ScriptError):
- return_value = task._test_patch()
- self.assertEqual(task.test_run_count(), 2)
-
- def test_fix(self):
- first_test_results = BindingsTestResults([])
- clean_test_results = BindingsTestResults(['TestMapLike.idl'])
- task = self._create_task(first_test_results, clean_test_results)
-
- return_value = task._test_patch()
- self.assertEqual(task.test_run_count(), 1)
- self.assertTrue(return_value)
-
- def test_ineffective_patch(self):
- first_test_results = BindingsTestResults(['TestMapLike.idl'])
- clean_test_results = BindingsTestResults(['TestMapLike.idl'])
- task = self._create_task(first_test_results, clean_test_results)
-
- return_value = task._test_patch()
- self.assertEqual(task.test_run_count(), 2)
- self.assertTrue(return_value)
-
- def test_partially_effective_patch(self):
- first_test_results = BindingsTestResults(['TestMapLike.idl'])
- clean_test_results = BindingsTestResults(['TestMapLike.idl', 'TestNode.idl'])
- task = self._create_task(first_test_results, clean_test_results)
-
- return_value = task._test_patch()
- self.assertEqual(task.test_run_count(), 2)
- self.assertTrue(return_value)
-
- def test_different_test_failures_in_patch_and_tree(self):
- first_test_results = BindingsTestResults(['TestNode.idl'])
- clean_test_results = BindingsTestResults(['TestMapLike.idl'])
- task = self._create_task(first_test_results, clean_test_results)
-
- with self.assertRaises(ScriptError):
- return_value = task._test_patch()
- self.assertEqual(task.test_run_count(), 2)
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py (263180 => 263181)
--- trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2020-06-17 20:23:17 UTC (rev 263180)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2020-06-17 21:29:24 UTC (rev 263181)
@@ -39,7 +39,6 @@
from webkitpy.common.system.executive import ScriptError
from webkitpy.common.unicode_compatibility import encode_for
from webkitpy.tool.bot.earlywarningsystemtask import EarlyWarningSystemTask, EarlyWarningSystemTaskDelegate
-from webkitpy.tool.bot.bindingstestresultsreader import BindingsTestResultsReader
from webkitpy.tool.bot.layouttestresultsreader import LayoutTestResultsReader
from webkitpy.tool.bot.jsctestresultsreader import JSCTestResultsReader
from webkitpy.tool.bot.patchanalysistask import UnableToApplyPatch, PatchIsNotValid, PatchIsNotApplicable
@@ -62,8 +61,6 @@
if self.group() == "jsc":
self._test_results_reader = JSCTestResultsReader(self._tool, self._port.jsc_results_directory())
- elif self.group() == "bindings":
- self._test_results_reader = BindingsTestResultsReader(self._tool, self._port.jsc_results_directory())
else:
self._test_results_reader = LayoutTestResultsReader(self._tool, self._port.results_directory(), self._log_directory())
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py (263180 => 263181)
--- trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py 2020-06-17 20:23:17 UTC (rev 263180)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py 2020-06-17 21:29:24 UTC (rev 263181)
@@ -30,7 +30,6 @@
from webkitpy.thirdparty.mock import Mock
from webkitpy.common.host import Host
from webkitpy.common.host_mock import MockHost
-from webkitpy.common.net.generictestresults import BindingsTestResults
from webkitpy.common.net.jsctestresults import JSCTestResults
from webkitpy.common.net.layouttestresults import LayoutTestResults
from webkitpy.common.system.outputcapture import OutputCapture
@@ -57,12 +56,6 @@
_group = "jsc"
-class TestBindingsEWS(AbstractEarlyWarningSystem):
- port_name = "mac"
- _build_style = None
- _group = "bindings"
-
-
class AbstractEarlyWarningSystemTest(QueuesTest):
def _test_message(self, ews, results, message):
ews.bind_to_tool(MockTool())
@@ -88,11 +81,6 @@
message = "New failing tests:\nes6.yaml/es6/typed_arrays_Int8Array.js.default\nes6.yaml/es6/typed_arrays_Uint8Array.js.default\napiTests"
self._test_message(ews, results, message)
- def test_failing_bindings_tests_message(self):
- ews = TestBindingsEWS()
- results = lambda a: BindingsTestResults(["(JS) TestMapLike.idl", "(JS) TestNode.idl"])
- message = "New failing tests:\n(JS) TestMapLike.idl\n(JS) TestNode.idl"
- self._test_message(ews, results, message)
class MockEarlyWarningSystemTaskForInconclusiveJSCResults(EarlyWarningSystemTask):
def _test_patch(self):
@@ -169,7 +157,6 @@
def test_ews_name(self):
# These are the names EWS's infrastructure expects, check that they work
expected_names = {
- 'bindings-ews',
'gtk-wk2-ews',
'ios-ews',
'ios-sim-ews',
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/checkpatchrelevance.py (263180 => 263181)
--- trunk/Tools/Scripts/webkitpy/tool/steps/checkpatchrelevance.py 2020-06-17 20:23:17 UTC (rev 263180)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/checkpatchrelevance.py 2020-06-17 21:29:24 UTC (rev 263181)
@@ -38,11 +38,6 @@
Options.quiet,
]
- bindings_paths = [
- "Source/WebCore",
- "Tools",
- ]
-
jsc_paths = [
"JSTests/",
"Source/_javascript_Core/",
@@ -65,7 +60,6 @@
]
group_to_paths_mapping = {
- 'bindings': bindings_paths,
'jsc': jsc_paths,
}
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py (263180 => 263181)
--- trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2020-06-17 20:23:17 UTC (rev 263180)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2020-06-17 21:29:24 UTC (rev 263181)
@@ -66,10 +66,6 @@
self._run_api_tests()
return
- if self._options.group == "bindings":
- self._run_bindings_tests()
- return
-
if self._options.iterate_on_new_tests:
_log.info("Running run-webkit-tests on new tests")
self._run_webkit_tests(self._options.iterate_on_new_tests)
@@ -146,14 +142,6 @@
args.append("--json-output=%s" % results_file_path)
self._tool.executive.run_and_throw_if_fail(args, cwd=self._tool.scm().checkout_root)
- def _run_bindings_tests(self):
- args = self._tool.deprecated_port().run_bindings_tests_command()
- results_directory = self._tool.port_factory.get(options=self._options).bindings_results_directory()
- self._tool.filesystem.maybe_make_directory(results_directory)
- results_file_path = self._tool.filesystem.join(results_directory, "bindings_test_results.json")
- args.append("--json-output=%s" % results_file_path)
- self._tool.executive.run_and_throw_if_fail(args, cwd=self._tool.scm().checkout_root)
-
def _run_api_tests(self):
args = self._tool.deprecated_port().run_api_tests_command(self._options.build_style)
results_directory = self._tool.port_factory.get(options=self._options).api_results_directory()
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py (263180 => 263181)
--- trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py 2020-06-17 20:23:17 UTC (rev 263180)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py 2020-06-17 21:29:24 UTC (rev 263181)
@@ -248,45 +248,6 @@
with self.assertRaises(ScriptError):
OutputCapture().assert_outputs(self, step.run, [{}], expected_logs=expected_logs)
- def test_runtests_bindings(self):
- mock_options = self._step_options()
- mock_options.non_interactive = False
- mock_options.group = "bindings"
- step = steps.RunTests(MockTool(log_executive=True), mock_options)
- tool = MockTool(log_executive=True)
- # 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 = """MOCK run_and_throw_if_fail: ['Tools/Scripts/run-bindings-tests', '--json-output=/tmp/bindings_test_results.json'], cwd=/mock-checkout
-"""
- OutputCapture().assert_outputs(self, step.run, [{}], expected_logs=expected_logs)
-
- def test_patch_relevant_bindings(self):
- self.maxDiff = None
- mock_options = self._step_options()
- mock_options.group = "bindings"
- tool = MockTool(log_executive=True)
- tool.scm()._mockChangedFiles = ["Source/WebCore/features.json", "Source/ChangeLog"]
- # 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.CheckPatchRelevance(tool, mock_options)
- expected_logs = """Checking relevance of patch
-"""
- OutputCapture().assert_outputs(self, step.run, [{}], expected_logs=expected_logs)
-
- def test_patch_not_relevant_bindings(self):
- self.maxDiff = None
- mock_options = self._step_options()
- mock_options.group = "bindings"
- tool = MockTool(log_executive=True)
- tool.scm()._mockChangedFiles = ["Source/_javascript_Core/Makefile", "Source/ChangeLog"]
- # 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.CheckPatchRelevance(tool, mock_options)
- expected_logs = """Checking relevance of patch
-This patch does not have relevant changes.
-"""
-
def test_runtests_api(self):
mock_options = self._step_options()
mock_options.non_interactive = False