- Revision
- 268723
- Author
- carlo...@webkit.org
- Date
- 2020-10-20 03:58:54 -0700 (Tue, 20 Oct 2020)
Log Message
WebDriver: start a https server too for tests
https://bugs.webkit.org/show_bug.cgi?id=217223
<rdar://problem/70136595>
Reviewed by Adrian Perez de Castro.
Tools:
Handle HTTPS configuration in WebDriver WPT server.
* Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py:
(WebDriverW3CExecutor.__init__): Set https configuration from server.
* Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py:
(WebDriverW3CWebServer._wait_for_server): Also wait for HTTPS port.
(WebDriverW3CWebServer.start): Write config file and get also https port.
(WebDriverW3CWebServer.http_port): Renamed port as http_port.
(WebDriverW3CWebServer.https_port): Added to return the https port.
(WebDriverW3CWebServer.port): Deleted.
WebDriverTests:
* imported/w3c/config.json: Add HTTPs configuration.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (268722 => 268723)
--- trunk/Tools/ChangeLog 2020-10-20 10:56:06 UTC (rev 268722)
+++ trunk/Tools/ChangeLog 2020-10-20 10:58:54 UTC (rev 268723)
@@ -1,3 +1,22 @@
+2020-10-20 Carlos Garcia Campos <cgar...@igalia.com>
+
+ WebDriver: start a https server too for tests
+ https://bugs.webkit.org/show_bug.cgi?id=217223
+ <rdar://problem/70136595>
+
+ Reviewed by Adrian Perez de Castro.
+
+ Handle HTTPS configuration in WebDriver WPT server.
+
+ * Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py:
+ (WebDriverW3CExecutor.__init__): Set https configuration from server.
+ * Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py:
+ (WebDriverW3CWebServer._wait_for_server): Also wait for HTTPS port.
+ (WebDriverW3CWebServer.start): Write config file and get also https port.
+ (WebDriverW3CWebServer.http_port): Renamed port as http_port.
+ (WebDriverW3CWebServer.https_port): Added to return the https port.
+ (WebDriverW3CWebServer.port): Deleted.
+
2020-10-20 Philippe Normand <pnorm...@igalia.com>
[Flatpak SDK] Update rr for AMD Ryzen support
Modified: trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py (268722 => 268723)
--- trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py 2020-10-20 10:56:06 UTC (rev 268722)
+++ trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py 2020-10-20 10:58:54 UTC (rev 268723)
@@ -135,7 +135,8 @@
server_config = {'browser_host': server.host(),
'domains': {'': {'': server.host()},
'alt':{ '': '127.0.0.1'}},
- 'ports': {'http': [str(server.port())]},
+ 'ports': {'http': [str(server.http_port())],
+ 'https': [str(server.https_port())]},
'doc_root': server.document_root()}
self.runner = TestRunner()
WdspecExecutor.__init__(self, self.runner.logger, driver.browser_name(), server_config, driver.binary_path(), None, capabilities=driver.capabilities())
Modified: trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py (268722 => 268723)
--- trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py 2020-10-20 10:56:06 UTC (rev 268722)
+++ trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py 2020-10-20 10:58:54 UTC (rev 268723)
@@ -71,7 +71,9 @@
start_time = time.time()
while time.time() - start_time < wait_secs:
- if self._port._executive.check_running_pid(self._pid) and check_port(self._server_host, self._server_port):
+ if self._port._executive.check_running_pid(self._pid) \
+ and check_port(self._server_host, self._server_http_port) \
+ and check_port(self._server_host, self._server_https_port):
return True
time.sleep(sleep_secs)
return False
@@ -92,11 +94,13 @@
_log.debug('Copying WebDriver WPT server config.json')
doc_root = os.path.join(WebKitFinder(self._port.host.filesystem).path_from_webkit_base('WebDriverTests'), 'imported', 'w3c')
config_filename = os.path.join(doc_root, 'config.json')
- config_json = self._port.host.filesystem.read_text_file(config_filename).replace("%DOC_ROOT%", doc_root)
- self._port.host.filesystem.write_text_file(os.path.join(self._layout_doc_root, 'config.json'), config_json)
- config = json.loads(config_json)
+ config = json.loads(self._port.host.filesystem.read_text_file(config_filename))
+ config['doc_root'] = doc_root
+ config['ssl']['openssl']['base_path'] = os.path.join(self._runtime_path, '_wpt_certs')
+ self._port.host.filesystem.write_text_file(os.path.join(self._layout_doc_root, 'config.json'), json.dumps(config))
self._server_host = config['browser_host']
- self._server_port = config['ports']['http'][0]
+ self._server_http_port = config['ports']['http'][0]
+ self._server_https_port = config['ports']['https'][0]
self._wsout = self._port.host.filesystem.open_text_file_for_writing(self._output_log_path)
wpt_file = os.path.join(self._layout_doc_root, "wpt.py")
@@ -110,7 +114,7 @@
self.stop()
raise RuntimeError
- _log.info('WebDriver WPT server listening at http://%s:%s/' % (self._server_host, self._server_port))
+ _log.info('WebDriver WPT server listening at http://%s:%s/ and https://%s:%s/' % (self._server_host, self._server_http_port, self._server_host, self._server_https_port))
def stop(self):
_log.debug('Cleaning WebDriver WPT server config.json')
@@ -129,9 +133,12 @@
def host(self):
return self._server_host
- def port(self):
- return self._server_port
+ def http_port(self):
+ return self._server_http_port
+ def https_port(self):
+ return self._server_https_port
+
def document_root(self):
return self._layout_doc_root
Modified: trunk/WebDriverTests/ChangeLog (268722 => 268723)
--- trunk/WebDriverTests/ChangeLog 2020-10-20 10:56:06 UTC (rev 268722)
+++ trunk/WebDriverTests/ChangeLog 2020-10-20 10:58:54 UTC (rev 268723)
@@ -1,5 +1,15 @@
2020-10-20 Carlos Garcia Campos <cgar...@igalia.com>
+ WebDriver: start a https server too for tests
+ https://bugs.webkit.org/show_bug.cgi?id=217223
+ <rdar://problem/70136595>
+
+ Reviewed by Adrian Perez de Castro.
+
+ * imported/w3c/config.json: Add HTTPs configuration.
+
+2020-10-20 Carlos Garcia Campos <cgar...@igalia.com>
+
WebDriver: add support for right variations of virtual keys
https://bugs.webkit.org/show_bug.cgi?id=217819
Modified: trunk/WebDriverTests/imported/w3c/config.json (268722 => 268723)
--- trunk/WebDriverTests/imported/w3c/config.json 2020-10-20 10:56:06 UTC (rev 268722)
+++ trunk/WebDriverTests/imported/w3c/config.json 2020-10-20 10:58:54 UTC (rev 268723)
@@ -1,10 +1,25 @@
{"browser_host": "localhost",
- "ports":{"http":[8802, null],
- "https": [null],
- "ws": [null],
- "wss": [null]},
+ "alternate_hosts": { "alt": "127.0.0.1" },
+ "ports": {"http":[8802, null],
+ "https": [9444],
+ "ws": [null],
+ "wss": [null]
+ },
"doc_root": "%DOC_ROOT%",
"check_subdomains": false,
"log_level":"debug",
- "bind_hostname": false
+ "bind_hostname": true,
+ "ssl": {"type": "openssl",
+ "encrypt_after_connect": false,
+ "openssl": {
+ "openssl_binary": "openssl",
+ "base_path": "%CERTS_DIR%",
+ "force_regenerate": false
+ },
+ "pregenerated": {
+ "host_key_path": null,
+ "host_cert_path": null
+ },
+ "none": {}
+ }
}
