<!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>[198116] 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/198116">198116</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-03-14 05:10:23 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web platform test server should not try to launch servers on already bound sockets
https://bugs.webkit.org/show_bug.cgi?id=141157
Reviewed by Darin Adler.
LayoutTests/imported/w3c:
* resources/config.json: Changed wpt https port from 8443 to 9443.
* web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt: Updated according https port change.
* web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt: Ditto.
* web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt: Ditto.
* web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt: Ditto.
Tools:
* Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
(wpt_config_json): Load WPT config from LayoutTests/imported/w3c/resources/config.json.
(base_url): Refactored to use wpt_config_json routine.
(WebPlatformTestServer.__init__): Fill port mappings according WPT config.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cresourcesconfigjson">trunk/LayoutTests/imported/w3c/resources/config.json</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapibasicmodenocorsexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapibasicmodenocorsworkerexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapibasicmodesameoriginexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapibasicmodesameoriginworkerexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsserversweb_platform_test_serverpy">trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (198115 => 198116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-03-14 12:02:21 UTC (rev 198115)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-03-14 12:10:23 UTC (rev 198116)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-14 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Web platform test server should not try to launch servers on already bound sockets
+ https://bugs.webkit.org/show_bug.cgi?id=141157
+
+ Reviewed by Darin Adler.
+
+ * resources/config.json: Changed wpt https port from 8443 to 9443.
+ * web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt: Updated according https port change.
+ * web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt: Ditto.
+ * web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt: Ditto.
+ * web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt: Ditto.
+
</ins><span class="cx"> 2016-03-11 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Use DeferredWrapper directly in FetchBody promise handling
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cresourcesconfigjson"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/resources/config.json (198115 => 198116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/resources/config.json 2016-03-14 12:02:21 UTC (rev 198115)
+++ trunk/LayoutTests/imported/w3c/resources/config.json 2016-03-14 12:10:23 UTC (rev 198116)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> {"host": "localhost",
</span><span class="cx"> "ports":{"http":[8800, 8801],
</span><del>- "https":[8443],
</del><ins>+ "https":[9443],
</ins><span class="cx"> "ws":[49001]},
</span><span class="cx"> "check_subdomains": false,
</span><span class="cx"> "log_level":"debug",
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapibasicmodenocorsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt (198115 => 198116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt 2016-03-14 12:02:21 UTC (rev 198115)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt 2016-03-14 12:10:23 UTC (rev 198116)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx">
</span><span class="cx"> FAIL Fetch ../resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
</span><span class="cx"> FAIL Fetch http://localhost:8800/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
</span><del>-FAIL Fetch https://localhost:8443/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
</del><ins>+FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
</ins><span class="cx"> FAIL Fetch http://www.localhost:8800/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapibasicmodenocorsworkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt (198115 => 198116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt 2016-03-14 12:02:21 UTC (rev 198115)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt 2016-03-14 12:10:23 UTC (rev 198116)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx">
</span><span class="cx"> FAIL Fetch ../resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
</span><span class="cx"> FAIL Fetch http://localhost:8800/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
</span><del>-FAIL Fetch https://localhost:8443/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
</del><ins>+FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
</ins><span class="cx"> FAIL Fetch http://www.localhost:8800/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapibasicmodesameoriginexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt (198115 => 198116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt 2016-03-14 12:02:21 UTC (rev 198115)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt 2016-03-14 12:10:23 UTC (rev 198116)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx">
</span><span class="cx"> FAIL Fetch ../resources/top.txt with same-origin mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
</span><span class="cx"> FAIL Fetch http://localhost:8800/fetch/api/resources/top.txt with same-origin mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
</span><del>-FAIL Fetch https://localhost:8443/fetch/api/resources/top.txt with same-origin mode assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
</del><ins>+FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with same-origin mode assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
</ins><span class="cx"> FAIL Fetch http://www.localhost:8800/fetch/api/resources/top.txt with same-origin mode assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapibasicmodesameoriginworkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt (198115 => 198116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt 2016-03-14 12:02:21 UTC (rev 198115)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt 2016-03-14 12:10:23 UTC (rev 198116)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx">
</span><span class="cx"> FAIL Fetch ../resources/top.txt with same-origin mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
</span><span class="cx"> FAIL Fetch http://localhost:8800/fetch/api/resources/top.txt with same-origin mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
</span><del>-FAIL Fetch https://localhost:8443/fetch/api/resources/top.txt with same-origin mode assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
</del><ins>+FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with same-origin mode assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
</ins><span class="cx"> FAIL Fetch http://www.localhost:8800/fetch/api/resources/top.txt with same-origin mode assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (198115 => 198116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-14 12:02:21 UTC (rev 198115)
+++ trunk/Tools/ChangeLog 2016-03-14 12:10:23 UTC (rev 198116)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-14 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Web platform test server should not try to launch servers on already bound sockets
+ https://bugs.webkit.org/show_bug.cgi?id=141157
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
+ (wpt_config_json): Load WPT config from LayoutTests/imported/w3c/resources/config.json.
+ (base_url): Refactored to use wpt_config_json routine.
+ (WebPlatformTestServer.__init__): Fill port mappings according WPT config.
+
</ins><span class="cx"> 2016-03-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(ES6_TEMPLATE_LITERAL_SYNTAX) guards
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsserversweb_platform_test_serverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py (198115 => 198116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2016-03-14 12:02:21 UTC (rev 198115)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2016-03-14 12:10:23 UTC (rev 198116)
</span><span class="lines">@@ -39,14 +39,20 @@
</span><span class="cx"> return doc_root
</span><span class="cx">
</span><span class="cx">
</span><del>-def base_url(port_obj):
</del><ins>+def wpt_config_json(port_obj):
</ins><span class="cx"> config_wk_filepath = port_obj._filesystem.join(port_obj.layout_tests_dir(), "imported", "w3c", "resources", "config.json")
</span><span class="cx"> if not port_obj.host.filesystem.isfile(config_wk_filepath):
</span><ins>+ return
+ json_data = port_obj._filesystem.read_text_file(config_wk_filepath)
+ return json.loads(json_data)
+
+
+def base_url(port_obj):
+ config = wpt_config_json(port_obj)
+ if not config:
</ins><span class="cx"> # This should only be hit by webkitpy unit tests
</span><span class="cx"> _log.debug("No WPT config file found")
</span><span class="cx"> return "http://localhost:8800/"
</span><del>- json_data = port_obj._filesystem.read_text_file(config_wk_filepath)
- config = json.loads(json_data)
</del><span class="cx"> ports = config["ports"]
</span><span class="cx"> return "http://" + config["host"] + ":" + str(ports["http"][0]) + "/"
</span><span class="cx">
</span><span class="lines">@@ -78,6 +84,17 @@
</span><span class="cx"> self._start_cmd = ["python", self._filesystem.join(current_dir_path, "web_platform_test_launcher.py"), self._servers_file]
</span><span class="cx"> self._doc_root_path = self._filesystem.join(self._layout_root, self._doc_root)
</span><span class="cx">
</span><ins>+ self._mappings = []
+ config = wpt_config_json(port_obj)
+ if config:
+ ports = config["ports"]
+ for key in ports:
+ for value in ports[key]:
+ port = {"port": value}
+ if key == "https":
+ port["sslcert"] = True
+ self._mappings.append(port)
+
</ins><span class="cx"> def _install_modules(self):
</span><span class="cx"> modules_file_path = self._filesystem.join(self._doc_root_path, "..", "resources", "web-platform-tests-modules.json")
</span><span class="cx"> if not self._filesystem.isfile(modules_file_path):
</span></span></pre>
</div>
</div>
</body>
</html>