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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@198116 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
index 667cba6a3328dac8fa480b562091046f57e8555c..5248dd572d1a443a4f03bc04ae500539ead11d50 100644 (file)
--- a/LayoutTests/imported/w3c/ChangeLog
+++ b/LayoutTests/imported/w3c/ChangeLog
@@ -1,3 +1,16 @@
+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.
+
 2016-03-11  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 
         [Fetch API] Use DeferredWrapper directly in FetchBody promise handling

diff --git a/LayoutTests/imported/w3c/resources/config.json b/LayoutTests/imported/w3c/resources/config.json
index 2678782aa02a2067893c330405811ed170538901..3de1b9642529d65b3d7fca53e9ed541e4c274a5c 100644 (file)
--- a/LayoutTests/imported/w3c/resources/config.json
+++ b/LayoutTests/imported/w3c/resources/config.json
@@ -1,6 +1,6 @@
 {"host": "localhost",
  "ports":{"http":[8800, 8801],
-          "https":[8443],
+          "https":[9443],
           "ws":[49001]},
  "check_subdomains": false,
  "log_level":"debug",

diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt
index 4afcc5cee2f387891e1199eb949492cc071d1bd7..d150a738c402270ec67cc77a68b671dfc870f3cd 100644 (file)
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt
@@ -1,6 +1,6 @@
 
 FAIL Fetch ../resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
 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"
-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"
+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"
 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"
 

diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt
index 4afcc5cee2f387891e1199eb949492cc071d1bd7..d150a738c402270ec67cc77a68b671dfc870f3cd 100644 (file)
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt
@@ -1,6 +1,6 @@
 
 FAIL Fetch ../resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
 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"
-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"
+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"
 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"
 

diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt
index 46907ec6c8cf6743e4fb58f6c1f83dc9d5aee6d4..9ac98691ab0f8633ad1f2743779c82929b77f07c 100644 (file)
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt
@@ -1,6 +1,6 @@
 
 FAIL Fetch ../resources/top.txt with same-origin mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
 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"
-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")
+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")
 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")
 

diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt
index 46907ec6c8cf6743e4fb58f6c1f83dc9d5aee6d4..9ac98691ab0f8633ad1f2743779c82929b77f07c 100644 (file)
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt
@@ -1,6 +1,6 @@
 
 FAIL Fetch ../resources/top.txt with same-origin mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
 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"
-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")
+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")
 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")
 

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3fe05cdd8410ed99daa8f0a78fa60f0a93fea1c3..4f3cee6c269aa352f478df3e598e94e4a00e6f90 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+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.
+
 2016-03-13  Joseph Pecoraro  <pecoraro@apple.com>
 
         Remove ENABLE(ES6_TEMPLATE_LITERAL_SYNTAX) guards

diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py b/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py
index ccb493166be7d493cae938f920a6f4a90605f67a..51c95bb290d698f62f2e063446d2703dd03bc087 100755 (executable)
--- a/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py
+++ b/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py
@@ -39,14 +39,20 @@ def doc_root(port_obj):
     return doc_root
 
 
-def base_url(port_obj):
+def wpt_config_json(port_obj):
     config_wk_filepath = port_obj._filesystem.join(port_obj.layout_tests_dir(), "imported", "w3c", "resources", "config.json")
     if not port_obj.host.filesystem.isfile(config_wk_filepath):
+        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:
         # This should only be hit by webkitpy unit tests
         _log.debug("No WPT config file found")
         return "http://localhost:8800/"
-    json_data = port_obj._filesystem.read_text_file(config_wk_filepath)
-    config = json.loads(json_data)
     ports = config["ports"]
     return "http://" + config["host"] + ":" + str(ports["http"][0]) + "/"
 
@@ -78,6 +84,17 @@ class WebPlatformTestServer(http_server_base.HttpServerBase):
         self._start_cmd = ["python", self._filesystem.join(current_dir_path, "web_platform_test_launcher.py"), self._servers_file]
         self._doc_root_path = self._filesystem.join(self._layout_root, self._doc_root)
 
+        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)
+
     def _install_modules(self):
         modules_file_path = self._filesystem.join(self._doc_root_path, "..", "resources", "web-platform-tests-modules.json")
         if not self._filesystem.isfile(modules_file_path):