<!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>[205539] trunk</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/205539">205539</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-07 01:55:44 -0700 (Wed, 07 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Using tests-options.json to compute whether tests are slow
https://bugs.webkit.org/show_bug.cgi?id=161626
Patch by Youenn Fablet <youenn@apple.com> on 2016-09-07
Reviewed by Darin Adler.
Tools:
* Scripts/webkitpy/layout_tests/controllers/manager_unittest.py: Updated first test to use a MockHost.
* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager.__init__): Loading tests-options.json
(Manager._test_is_slow): Computing timeout value based on tests-options.json.
LayoutTests:
* TestExpectations: Removing slow WPT expectations now that they are handled through tests-options.json.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollersmanagerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollersmanager_unittestpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205538 => 205539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-07 08:20:48 UTC (rev 205538)
+++ trunk/LayoutTests/ChangeLog 2016-09-07 08:55:44 UTC (rev 205539)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-09-07 Youenn Fablet <youenn@apple.com>
+
+ Using tests-options.json to compute whether tests are slow
+ https://bugs.webkit.org/show_bug.cgi?id=161626
+
+ Reviewed by Darin Adler.
+
+ * TestExpectations: Removing slow WPT expectations now that they are handled through tests-options.json.
+
</ins><span class="cx"> 2016-09-06 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK][Threaded Compositor] Several flaky tests
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (205538 => 205539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-09-07 08:20:48 UTC (rev 205538)
+++ trunk/LayoutTests/TestExpectations 2016-09-07 08:55:44 UTC (rev 205539)
</span><span class="lines">@@ -262,20 +262,6 @@
</span><span class="cx"> imported/w3c/web-platform-tests/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html [ Pass Failure ]
</span><span class="cx"> imported/w3c/web-platform-tests/html/browsers/windows/targeting-cross-origin-nested-browsing-contexts.sub.html [ Pass Failure ]
</span><span class="cx">
</span><del>-# W3C XMLHttpRequest tests
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-aborted.html [ Slow ]
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html [ Slow ]
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overrides.html [ Slow ]
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html [ Slow ]
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-simple.html [ Slow ]
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-synconmain.html [ Slow ]
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-twice.html [ Slow ]
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html [ Slow ]
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html [ Slow ]
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html [ Slow ]
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html [ Slow ]
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html [ Slow ]
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html [ Slow ]
</del><span class="cx"> # XMLHttpRequest tests requiring DTR/WTR to allow other URLs than localhost to not be blocked and be reachable (www2.localhost)
</span><span class="cx"> imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus.htm [ Skip ]
</span><span class="cx"> imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-cors.htm [ Skip ]
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205538 => 205539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-07 08:20:48 UTC (rev 205538)
+++ trunk/Tools/ChangeLog 2016-09-07 08:55:44 UTC (rev 205539)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-09-07 Youenn Fablet <youenn@apple.com>
+
+ Using tests-options.json to compute whether tests are slow
+ https://bugs.webkit.org/show_bug.cgi?id=161626
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/layout_tests/controllers/manager_unittest.py: Updated first test to use a MockHost.
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ (Manager.__init__): Loading tests-options.json
+ (Manager._test_is_slow): Computing timeout value based on tests-options.json.
+
</ins><span class="cx"> 2016-09-07 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Need the libosmesa to support the software backend drawing.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollersmanagerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (205538 => 205539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2016-09-07 08:20:48 UTC (rev 205538)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2016-09-07 08:55:44 UTC (rev 205539)
</span><span class="lines">@@ -86,6 +86,9 @@
</span><span class="cx"> self._finder = LayoutTestFinder(self._port, self._options)
</span><span class="cx"> self._runner = LayoutTestRunner(self._options, self._port, self._printer, self._results_directory, self._test_is_slow)
</span><span class="cx">
</span><ins>+ test_options_json_path = self._port.path_from_webkit_base(self.LAYOUT_TESTS_DIRECTORY, "tests-options.json")
+ self._tests_options = json.loads(self._filesystem.read_text_file(test_options_json_path)) if self._filesystem.exists(test_options_json_path) else {}
+
</ins><span class="cx"> def _collect_tests(self, args):
</span><span class="cx"> return self._finder.find_tests(self._options, args)
</span><span class="cx">
</span><span class="lines">@@ -131,7 +134,9 @@
</span><span class="cx"> self._is_http_test(test_file))
</span><span class="cx">
</span><span class="cx"> def _test_is_slow(self, test_file):
</span><del>- return self._expectations.model().has_modifier(test_file, test_expectations.SLOW)
</del><ins>+ if self._expectations.model().has_modifier(test_file, test_expectations.SLOW):
+ return True
+ return "slow" in self._tests_options.get(test_file, [])
</ins><span class="cx">
</span><span class="cx"> def needs_servers(self, test_names):
</span><span class="cx"> return any(self._is_http_test(test_name) for test_name in test_names) and self._options.http
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollersmanager_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py (205538 => 205539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py 2016-09-07 08:20:48 UTC (rev 205538)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py 2016-09-07 08:55:44 UTC (rev 205539)
</span><span class="lines">@@ -48,7 +48,8 @@
</span><span class="cx"> return 'imported/w3c/wpt'
</span><span class="cx">
</span><span class="cx"> def get_manager():
</span><del>- port = Mock() # FIXME: Use a tighter mock.
</del><ins>+ host = MockHost()
+ port = host.port_factory.get()
</ins><span class="cx"> port.TEST_PATH_SEPARATOR = '/'
</span><span class="cx"> port.web_platform_test_server_doc_root = get_wpt_doc_root
</span><span class="cx"> manager = Manager(port, options=MockOptions(http=True), printer=Mock())
</span></span></pre>
</div>
</div>
</body>
</html>