Title: [217913] trunk/Tools
- Revision
- 217913
- Author
- ryanhad...@apple.com
- Date
- 2017-06-07 17:51:11 -0700 (Wed, 07 Jun 2017)
Log Message
Unreviewed, rolling out r217902.
This change appears to have caused imported/w3c/web-platform-
tests/fetch/api/cors tests to fail on El Capitan.
Reverted changeset:
"Teach run-webkit-tests how to run HTTPS Web Platform Tests"
https://bugs.webkit.org/show_bug.cgi?id=172930
http://trac.webkit.org/changeset/217902
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (217912 => 217913)
--- trunk/Tools/ChangeLog 2017-06-08 00:05:55 UTC (rev 217912)
+++ trunk/Tools/ChangeLog 2017-06-08 00:51:11 UTC (rev 217913)
@@ -1,3 +1,16 @@
+2017-06-07 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r217902.
+
+ This change appears to have caused imported/w3c/web-platform-
+ tests/fetch/api/cors tests to fail on El Capitan.
+
+ Reverted changeset:
+
+ "Teach run-webkit-tests how to run HTTPS Web Platform Tests"
+ https://bugs.webkit.org/show_bug.cgi?id=172930
+ http://trac.webkit.org/changeset/217902
+
2017-06-07 Daniel Bates <daba...@apple.com>
Teach run-webkit-tests how to run HTTPS Web Platform Tests
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py (217912 => 217913)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2017-06-08 00:05:55 UTC (rev 217912)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2017-06-08 00:51:11 UTC (rev 217913)
@@ -55,16 +55,6 @@
return "http://" + config["host"] + ":" + str(ports["http"][0]) + "/"
-def https_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:9443/"
- ports = config["ports"]
- return "https://" + config["host"] + ":" + str(ports["https"][0]) + "/"
-
-
def is_wpt_server_running(port_obj):
config = wpt_config_json(port_obj)
if not config:
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (217912 => 217913)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2017-06-08 00:05:55 UTC (rev 217912)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2017-06-08 00:51:11 UTC (rev 217913)
@@ -1023,9 +1023,6 @@
def web_platform_test_server_base_url(self):
return web_platform_test_server.base_url(self)
- def web_platform_test_server_https_base_url(self):
- return web_platform_test_server.https_base_url(self)
-
def http_server_supports_ipv6(self):
# Cygwin is the only platform to still use Apache 1.3, which only supports IPV4.
# Once it moves to Apache 2, we can drop this method altogether.
Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (217912 => 217913)
--- trunk/Tools/Scripts/webkitpy/port/driver.py 2017-06-08 00:05:55 UTC (rev 217912)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2017-06-08 00:51:11 UTC (rev 217913)
@@ -1,5 +1,5 @@
# Copyright (C) 2011 Google Inc. All rights reserved.
-# Copyright (c) 2015-2017 Apple Inc. All rights reserved.
+# Copyright (c) 2015, 2016 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
@@ -166,9 +166,8 @@
else:
self._profiler = None
- self._web_platform_test_server_doc_root = self._port.web_platform_test_server_doc_root()
- self._web_platform_test_server_base_url = self._port.web_platform_test_server_base_url()
- self._web_platform_test_server_https_base_url = self._port.web_platform_test_server_https_base_url()
+ self.web_platform_test_server_doc_root = self._port.web_platform_test_server_doc_root()
+ self.web_platform_test_server_base_url = self._port.web_platform_test_server_base_url()
def __del__(self):
self.stop()
@@ -265,20 +264,14 @@
return test_name.startswith(self.WEBKIT_SPECIFIC_WEB_PLATFORM_TEST_SUBDIR)
def is_web_platform_test(self, test_name):
- return test_name.startswith(self._web_platform_test_server_doc_root)
+ return test_name.startswith(self.web_platform_test_server_doc_root)
- def _web_platform_test_base_url_for_test(self, test_name):
- needs_https_server = '.https.' in test_name
- if needs_https_server:
- return self._web_platform_test_server_https_base_url
- return self._web_platform_test_server_base_url
-
def test_to_uri(self, test_name):
"""Convert a test name to a URI."""
if self.is_web_platform_test(test_name):
- return self._web_platform_test_base_url_for_test(test_name) + test_name[len(self._web_platform_test_server_doc_root):]
+ return self.web_platform_test_server_base_url + test_name[len(self.web_platform_test_server_doc_root):]
if self.is_webkit_specific_web_platform_test(test_name):
- return self._web_platform_test_base_url_for_test(test_name) + self.WEBKIT_WEB_PLATFORM_TEST_SERVER_ROUTE + test_name[len(self.WEBKIT_SPECIFIC_WEB_PLATFORM_TEST_SUBDIR):]
+ return self.web_platform_test_server_base_url + self.WEBKIT_WEB_PLATFORM_TEST_SERVER_ROUTE + test_name[len(self.WEBKIT_SPECIFIC_WEB_PLATFORM_TEST_SUBDIR):]
if not self.is_http_test(test_name):
return path.abspath_to_uri(self._port.host.platform, self._port.abspath_for_test(test_name))
@@ -303,14 +296,10 @@
if not prefix.endswith('/'):
prefix += '/'
return uri[len(prefix):]
- if uri.startswith(self._web_platform_test_server_base_url + self.WEBKIT_WEB_PLATFORM_TEST_SERVER_ROUTE):
- return uri.replace(self._web_platform_test_server_base_url + self.WEBKIT_WEB_PLATFORM_TEST_SERVER_ROUTE, self.WEBKIT_SPECIFIC_WEB_PLATFORM_TEST_SUBDIR)
- if uri.startswith(self._web_platform_test_server_base_url):
- return uri.replace(self._web_platform_test_server_base_url, self._web_platform_test_server_doc_root)
- if uri.startswith(self._web_platform_test_server_https_base_url + self.WEBKIT_WEB_PLATFORM_TEST_SERVER_ROUTE):
- return uri.replace(self._web_platform_test_server_https_base_url + self.WEBKIT_WEB_PLATFORM_TEST_SERVER_ROUTE, self.WEBKIT_SPECIFIC_WEB_PLATFORM_TEST_SUBDIR)
- if uri.startswith(self._web_platform_test_server_https_base_url):
- return uri.replace(self._web_platform_test_server_https_base_url, self._web_platform_test_server_doc_root)
+ if uri.startswith(self.web_platform_test_server_base_url + self.WEBKIT_WEB_PLATFORM_TEST_SERVER_ROUTE):
+ return uri.replace(self.web_platform_test_server_base_url + self.WEBKIT_WEB_PLATFORM_TEST_SERVER_ROUTE, self.WEBKIT_SPECIFIC_WEB_PLATFORM_TEST_SUBDIR)
+ if uri.startswith(self.web_platform_test_server_base_url):
+ return uri.replace(self.web_platform_test_server_base_url, self.web_platform_test_server_doc_root)
if uri.startswith("http://"):
return uri.replace('http://127.0.0.1:8000/', self.HTTP_DIR)
if uri.startswith("https://"):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
