Diff
Modified: trunk/Tools/ChangeLog (214362 => 214363)
--- trunk/Tools/ChangeLog 2017-03-24 18:56:57 UTC (rev 214362)
+++ trunk/Tools/ChangeLog 2017-03-24 19:01:26 UTC (rev 214363)
@@ -1,3 +1,25 @@
+2017-03-24 Srinivasan Vijayaraghavan <svijayaragha...@apple.com>
+
+ webkitpy: Parse JSON results from run-api-tests
+ https://bugs.webkit.org/show_bug.cgi?id=170062
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/webkitpy/common/net/apitestresults.py: Added.
+ (APITestResults): Structure to represent API test results.
+ (APITestResults.__init__):
+ (APITestResults.intersection): Return the failures common to both sets of results.
+ (APITestResults.results_from_string): Create an APITestResults object from a JSON results string.
+ (APITestResults.equals): Return True if both results were the same.
+ (APITestResults.is_subset): Return True if failing tests are a subset of the other failing tests.
+ (APITestResults.all_passed): Return True if everything passed.
+ (APITestResults.failing_tests): List of tests that didn't pass.
+ (APITestResults.did_exceed_test_failure_limit): Always False.
+ * Scripts/webkitpy/common/net/apitestresults_unittest.py: Added.
+ (APITestResultsTest): Unit tests.
+ * Scripts/webkitpy/tool/bot/apitestresultsreader.py: Added.
+ (APITestResultsReader): Read contents of JSON results file.
+
2017-03-24 Alex Christensen <achristen...@webkit.org>
REGRESSION: Content Blocker: Blocking "a[href*=randomString]" doesn't work
Added: trunk/Tools/Scripts/webkitpy/common/net/apitestresults.py (0 => 214363)
--- trunk/Tools/Scripts/webkitpy/common/net/apitestresults.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/common/net/apitestresults.py 2017-03-24 19:01:26 UTC (rev 214363)
@@ -0,0 +1,68 @@
+# 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
Added: trunk/Tools/Scripts/webkitpy/common/net/apitestresults_unittest.py (0 => 214363)
--- trunk/Tools/Scripts/webkitpy/common/net/apitestresults_unittest.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/common/net/apitestresults_unittest.py 2017-03-24 19:01:26 UTC (rev 214363)
@@ -0,0 +1,50 @@
+# 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)))
Added: trunk/Tools/Scripts/webkitpy/tool/bot/apitestresultsreader.py (0 => 214363)
--- trunk/Tools/Scripts/webkitpy/tool/bot/apitestresultsreader.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/apitestresultsreader.py 2017-03-24 19:01:26 UTC (rev 214363)
@@ -0,0 +1,35 @@
+# 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)
