<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214363] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214363">214363</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-24 12:01:26 -0700 (Fri, 24 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkitpy: Parse JSON results from run-api-tests
https://bugs.webkit.org/show_bug.cgi?id=170062
Patch by Srinivasan Vijayaraghavan <svijayaraghavan@apple.com> on 2017-03-24
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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsScriptswebkitpycommonnetapitestresultspy">trunk/Tools/Scripts/webkitpy/common/net/apitestresults.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetapitestresults_unittestpy">trunk/Tools/Scripts/webkitpy/common/net/apitestresults_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolbotapitestresultsreaderpy">trunk/Tools/Scripts/webkitpy/tool/bot/apitestresultsreader.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214362 => 214363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-24 18:56:57 UTC (rev 214362)
+++ trunk/Tools/ChangeLog 2017-03-24 19:01:26 UTC (rev 214363)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-03-24 Srinivasan Vijayaraghavan <svijayaraghavan@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.
+
</ins><span class="cx"> 2017-03-24 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Content Blocker: Blocking "a[href*=randomString]" doesn't work
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetapitestresultspy"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/common/net/apitestresults.py (0 => 214363)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+# 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
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetapitestresults_unittestpy"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/common/net/apitestresults_unittest.py (0 => 214363)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+# 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)))
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolbotapitestresultsreaderpy"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/tool/bot/apitestresultsreader.py (0 => 214363)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+# 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)
</ins></span></pre>
</div>
</div>
</body>
</html>