Tools/ChangeLog

 12015-02-23 Youenn Fablet <youenn.fablet@crf.canon.fr>
 2
 3 Web platform test server should not try to launch servers on already bound sockets
 4 https://bugs.webkit.org/show_bug.cgi?id=141157
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 * Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
 9 (wpt_config_json): Load WPT config from LayoutTests/imported/w3c/resources/config.json.
 10 (base_url): Refactored to use wpt_config_json routine.
 11 (WebPlatformTestServer.__init__): Fill port mappings according WPT config.
 12
1132015-02-21 Youenn Fablet <youenn.fablet@crf.canon.fr>
214
315 Tests don't work on some bots: Failed to stop wptwk

Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py

@@def doc_root(port_obj):
3939 return doc_root
4040
4141
42 def base_url(port_obj):
 42def wpt_config_json(port_obj):
4343 config_wk_filepath = port_obj.path_from_webkit_base("LayoutTests", "imported", "w3c", "resources", "config.json")
4444 if not port_obj.host.filesystem.isfile(config_wk_filepath):
 45 return
 46 json_data = port_obj._filesystem.read_text_file(config_wk_filepath)
 47 return json.loads(json_data)
 48
 49
 50def base_url(port_obj):
 51 config = wpt_config_json(port_obj)
 52 if not config:
4553 # This should only be hit by webkitpy unit tests
4654 _log.debug("No WPT config file found")
4755 return "http://localhost:8800/"
48  json_data = port_obj._filesystem.read_text_file(config_wk_filepath)
49  config = json.loads(json_data)
5056 ports = config["ports"]
5157 return "http://" + config["host"] + ":" + str(ports["http"][0]) + "/"
5258

@@class WebPlatformTestServer(http_server_base.HttpServerBase):
7884 self._start_cmd = ["python", self._filesystem.join(current_dir_path, "web_platform_test_launcher.py"), self._servers_file]
7985 self._doc_root_path = port_obj.path_from_webkit_base("LayoutTests", self._doc_root)
8086
 87 self._mappings = []
 88 config = wpt_config_json(port_obj)
 89 if config:
 90 ports = config["ports"]
 91 for key in ports:
 92 for value in ports[key]:
 93 port = {"port": value}
 94 if key == "https":
 95 port["sslcert"] = True
 96 self._mappings.append(port)
 97
8198 def _install_modules(self):
8299 modules_file_path = self._filesystem.join(self._layout_root, "imported", "w3c", "resources", "WPTModules")
83100 if not self._filesystem.isfile(modules_file_path):

LayoutTests/imported/w3c/ChangeLog

 12015-02-23 Youenn Fablet <youenn.fablet@crf.canon.fr>
 2
 3 Web platform test server should not try to launch servers on already bound sockets
 4 https://bugs.webkit.org/show_bug.cgi?id=141157
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 * resources/config.json: Changed wpt https port from 8443 to 9443.
 9
1102015-02-20 Alexey Proskuryakov <ap@apple.com>
211
312 Remove svn:keywords property.

LayoutTests/imported/w3c/resources/config.json

11{"host": "localhost",
22 "ports":{"http":[8800, 8801],
3  "https":[8443],
 3 "https":[9443],
44 "ws":[49001]},
55 "check_subdomains": false,
66 "log_level":"debug",