Diff
Modified: trunk/Tools/ChangeLog (263307 => 263308)
--- trunk/Tools/ChangeLog 2020-06-20 01:07:52 UTC (rev 263307)
+++ trunk/Tools/ChangeLog 2020-06-20 01:22:52 UTC (rev 263308)
@@ -1,3 +1,23 @@
+2020-06-19 Aakash Jain <aakash_j...@apple.com>
+
+ Delete dead code for old ews api tests
+ https://bugs.webkit.org/show_bug.cgi?id=213421
+
+ Rubber-stamped by Alexey Proskuryakov.
+
+ * Scripts/webkitpy/common/config/ports.py:
+ (DeprecatedPort.run_api_tests_command): Deleted.
+ * Scripts/webkitpy/common/net/apitestresults.py: Removed.
+ * Scripts/webkitpy/common/net/apitestresults_unittest.py: Removed.
+ * Scripts/webkitpy/port/base.py:
+ (Port.bindings_results_directory):
+ (Port.api_results_directory): Deleted.
+ * Scripts/webkitpy/tool/bot/apitestresultsreader.py: Removed.
+ * Scripts/webkitpy/tool/steps/runtests.py:
+ (RunTests._run_api_tests): Deleted.
+ * Scripts/webkitpy/tool/steps/steps_unittest.py:
+ (test_runtests_api_debug): Deleted.
+
2020-06-19 Jonathan Bedard <jbed...@apple.com>
Bring up watchOS/tvOS on build.webkit.org
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (263307 => 263308)
--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2020-06-20 01:07:52 UTC (rev 263307)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2020-06-20 01:22:52 UTC (rev 263308)
@@ -131,10 +131,6 @@
def run_perl_unittests_command(self):
return self.script_shell_command("test-webkitperl")
- 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)
-
def run_sort_xcode_project_file_command(self):
return self.script_shell_command("sort-Xcode-project-file")
Deleted: trunk/Tools/Scripts/webkitpy/common/net/apitestresults.py (263307 => 263308)
--- trunk/Tools/Scripts/webkitpy/common/net/apitestresults.py 2020-06-20 01:07:52 UTC (rev 263307)
+++ trunk/Tools/Scripts/webkitpy/common/net/apitestresults.py 2020-06-20 01:22:52 UTC (rev 263308)
@@ -1,68 +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 APITestResults(AbstractTestResults):
- def __init__(self, failures, timeouts):
- self._failures = failures
- self._timeouts = timeouts
-
- self._tests_not_passed = failures + timeouts
-
- @classmethod
- def intersection(cls, first, second):
- intersection_failures = list(set(first._failures) & set(second._failures))
- intersection_timeouts = list(set(first._timeouts) & set(second._timeouts))
- return cls(intersection_failures, intersection_timeouts)
-
- @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 or 'timeouts' not in parsed_results:
- return None
-
- return cls(parsed_results['failures'], parsed_results['timeouts'])
-
- def equals(self, other):
- return set(self._failures) == set(other._failures) and set(self._timeouts) == set(other._timeouts)
-
- def is_subset(self, other):
- return set(self._failures) <= set(other._failures) and set(self._timeouts) <= set(other._timeouts)
-
- def all_passed(self):
- return not self._tests_not_passed
-
- def failing_tests(self):
- return self._tests_not_passed
-
- # No defined failure limit for API tests.
- def did_exceed_test_failure_limit(self):
- return False
Deleted: trunk/Tools/Scripts/webkitpy/common/net/apitestresults_unittest.py (263307 => 263308)
--- trunk/Tools/Scripts/webkitpy/common/net/apitestresults_unittest.py 2020-06-20 01:07:52 UTC (rev 263307)
+++ trunk/Tools/Scripts/webkitpy/common/net/apitestresults_unittest.py 2020-06-20 01:22:52 UTC (rev 263308)
@@ -1,50 +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.apitestresults import APITestResults
-
-
-class APITestResultsTest(unittest.TestCase):
- def test_results_from_string(self):
- incomplete_json_v1 = '{"failures": []}'
- incomplete_json_v2 = '{"timeouts":[]}'
- self.assertEqual(None, APITestResults.results_from_string(incomplete_json_v1))
- self.assertEqual(None, APITestResults.results_from_string(incomplete_json_v2))
-
- no_failures_string = '{"timeouts": [], "failures":[]}'
- no_failures_results = APITestResults([], [])
- self.assertTrue(no_failures_results.equals(APITestResults.results_from_string(no_failures_string)))
-
- many_failures_string = '{"timeouts":["TimeRanges.AddOrder"], "failures": ["FloatPoint.Math", "URLParserTest.Basic"]}'
- many_failures_results = APITestResults(["FloatPoint.Math", "URLParserTest.Basic"], ["TimeRanges.AddOrder"])
- self.assertTrue(many_failures_results.equals(APITestResults.results_from_string(many_failures_string)))
-
- self.assertFalse(no_failures_results.equals(many_failures_results))
-
- def test_intersection(self):
- results1 = APITestResults(['failure1', 'failure2'], ['timeout1'])
- results2 = APITestResults(['failure1'], ['timeout1', 'timeout2'])
-
- expected_intersection = APITestResults(['failure1'], ['timeout1'])
- self.assertTrue(expected_intersection.equals(APITestResults.intersection(results1, results2)))
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (263307 => 263308)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2020-06-20 01:07:52 UTC (rev 263307)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2020-06-20 01:22:52 UTC (rev 263308)
@@ -839,9 +839,6 @@
def bindings_results_directory(self):
return self._build_path()
- def api_results_directory(self):
- return self._build_path()
-
def results_directory(self):
"""Absolute path to the place to store the test results (uses --results-directory)."""
if not self._results_directory:
Deleted: trunk/Tools/Scripts/webkitpy/tool/bot/apitestresultsreader.py (263307 => 263308)
--- trunk/Tools/Scripts/webkitpy/tool/bot/apitestresultsreader.py 2020-06-20 01:07:52 UTC (rev 263307)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/apitestresultsreader.py 2020-06-20 01:22:52 UTC (rev 263308)
@@ -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.apitestresults import APITestResults
-from webkitpy.tool.bot.abstracttestresultsreader import AbstractTestResultsReader
-
-_log = logging.getLogger(__name__)
-
-
-class APITestResultsReader(AbstractTestResultsReader):
- def results(self):
- results_path = self._host.filesystem.join(self._results_directory, 'api_test_results.json')
- contents = self._read_file_contents(results_path)
- return APITestResults.results_from_string(contents)
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py (263307 => 263308)
--- trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2020-06-20 01:07:52 UTC (rev 263307)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2020-06-20 01:22:52 UTC (rev 263308)
@@ -62,10 +62,6 @@
self._run_javascriptcore_tests()
return
- if self._options.group == "api":
- self._run_api_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)
@@ -141,10 +137,3 @@
results_file_path = self._tool.filesystem.join(results_directory, "jsc_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()
- results_file_path = self._tool.filesystem.join(results_directory, "api_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)
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py (263307 => 263308)
--- trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py 2020-06-20 01:07:52 UTC (rev 263307)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py 2020-06-20 01:22:52 UTC (rev 263308)
@@ -247,29 +247,3 @@
"""
with self.assertRaises(ScriptError):
OutputCapture().assert_outputs(self, step.run, [{}], expected_logs=expected_logs)
-
- def test_runtests_api(self):
- mock_options = self._step_options()
- mock_options.non_interactive = False
- mock_options.build_style = "release"
- mock_options.group = "api"
- step = steps.RunTests(MockTool(log_executive=True), mock_options)
- tool = MockTool(log_executive=True)
- tool._deprecated_port = DeprecatedPort()
- step = steps.RunTests(tool, mock_options)
- expected_logs = """MOCK run_and_throw_if_fail: ['Tools/Scripts/run-api-tests', '--release', '--json-output=/tmp/api_test_results.json'], cwd=/mock-checkout
-"""
- OutputCapture().assert_outputs(self, step.run, [{}], expected_logs=expected_logs)
-
- def test_runtests_api_debug(self):
- mock_options = self._step_options()
- mock_options.non_interactive = False
- mock_options.build_style = "debug"
- mock_options.group = "api"
- step = steps.RunTests(MockTool(log_executive=True), mock_options)
- tool = MockTool(log_executive=True)
- tool._deprecated_port = DeprecatedPort()
- step = steps.RunTests(tool, mock_options)
- expected_logs = """MOCK run_and_throw_if_fail: ['Tools/Scripts/run-api-tests', '--debug', '--json-output=/tmp/api_test_results.json'], cwd=/mock-checkout
-"""
- OutputCapture().assert_outputs(self, step.run, [{}], expected_logs=expected_logs)
