Multiple Layout tests from web-platform-tests/beacon/ are timing out.

https://bugs.webkit.org/show_bug.cgi?id=175076
<rdar://problem/33704752>

Reviewed by Alexey Proskuryakov.

LayoutTests/imported/w3c:

Rebaseline tests that are now passing.

* web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt:
* web-platform-tests/fetch/api/cors/cors-basic.any.worker-expected.txt:
* web-platform-tests/fetch/api/cors/cors-no-preflight.any-expected.txt:
* web-platform-tests/fetch/api/cors/cors-origin.any-expected.txt:
* web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt:

Source/WebKit:

* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::completeAuthenticationChallenge):
In the NETWORK_SESSION code path, we did not ask the client about server trust evaluation
when the clientCredentialPolicy was CannotAskClientForCredentials. This is because the
same delegate is used for HTTP authentication and server trust evaluation in the
NETWORK_SESSION code path. To align both code paths, we now ask the client about server
trust evaluation even if the policy CannotAskClientForCredentials. This allows WKTR
to trust certificates for localhost / 127.0.0.1 unconditionally and consistently.

LayoutTests:

* platform/ios-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt: Removed.
* platform/ios-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt: Removed.
* platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt: Removed.
* platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any.worker-expected.txt: Removed.
* platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-no-preflight.any-expected.txt: Removed.
* platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any-expected.txt: Removed.
* platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt: Removed.
* platform/mac-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt: Removed.
* platform/mac-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt: Removed.
Drop platform-specific expectations as those tests are now passing everywhere.

* platform/wk2/TestExpectations:
Unskip tests that are now passing.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 03bb5725c7f1d7befd94de3a1819ef03acd9ce0b..8ca86c5a4fe5bbcbeb99c6881d3d9fe882c7c0df 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,25 @@
+2017-08-03  Chris Dumez  <cdumez@apple.com>
+
+        Multiple Layout tests from web-platform-tests/beacon/ are timing out.
+        https://bugs.webkit.org/show_bug.cgi?id=175076
+        <rdar://problem/33704752>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * platform/ios-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt: Removed.
+        * platform/ios-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt: Removed.
+        * platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt: Removed.
+        * platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any.worker-expected.txt: Removed.
+        * platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-no-preflight.any-expected.txt: Removed.
+        * platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any-expected.txt: Removed.
+        * platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt: Removed.
+        * platform/mac-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt: Removed.
+        * platform/mac-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt: Removed.
+        Drop platform-specific expectations as those tests are now passing everywhere.
+
+        * platform/wk2/TestExpectations:
+        Unskip tests that are now passing.
+
 2017-08-03  Matt Baker  <mattbaker@apple.com>
 
         Web Inspector: Instrument WebGLProgram created/deleted

diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
index 7cafc8347ba289b3d0591145f45b16a084be6409..514f4f43026ddcaf3df3658c668257c4722c36af 100644 (file)
--- a/LayoutTests/imported/w3c/ChangeLog
+++ b/LayoutTests/imported/w3c/ChangeLog
@@ -1,3 +1,19 @@
+2017-08-03  Chris Dumez  <cdumez@apple.com>
+
+        Multiple Layout tests from web-platform-tests/beacon/ are timing out.
+        https://bugs.webkit.org/show_bug.cgi?id=175076
+        <rdar://problem/33704752>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Rebaseline tests that are now passing.
+
+        * web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt:
+        * web-platform-tests/fetch/api/cors/cors-basic.any.worker-expected.txt:
+        * web-platform-tests/fetch/api/cors/cors-no-preflight.any-expected.txt:
+        * web-platform-tests/fetch/api/cors/cors-origin.any-expected.txt:
+        * web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt:
+
 2017-08-03  Youenn Fablet  <youenn@apple.com>
 
         [Fetch API] Add support for Request keepalive getter

diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt
index f9a97c2ae4708884327723b4c7f9641c337398c5..8ac4928f0860cfc6063654a7cd8a29e2c9643242 100644 (file)
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt
@@ -1,23 +1,27 @@
 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
 CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
 CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
 CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8801/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load https://127.0.0.1:9443/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
 
 PASS Same domain different port [no-cors mode] 
 PASS Same domain different port [server forbid CORS] 
 PASS Same domain different port [cors mode] 
-FAIL Same domain different protocol different port [no-cors mode] promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS Same domain different protocol different port [no-cors mode] 
 PASS Same domain different protocol different port [server forbid CORS] 
-FAIL Same domain different protocol different port [cors mode] promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS Same domain different protocol different port [cors mode] 
 PASS Cross domain basic usage [no-cors mode] 
 PASS Cross domain basic usage [server forbid CORS] 
 PASS Cross domain basic usage [cors mode] 
 PASS Cross domain different port [no-cors mode] 
 PASS Cross domain different port [server forbid CORS] 
 PASS Cross domain different port [cors mode] 
-FAIL Cross domain different protocol [no-cors mode] promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS Cross domain different protocol [no-cors mode] 
 PASS Cross domain different protocol [server forbid CORS] 
-FAIL Cross domain different protocol [cors mode] promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS Cross domain different protocol [cors mode] 
 

diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any.worker-expected.txt
index d9ef3ebd881cdc78899c41de7bef6cd4f7f48c80..6bb8eadd749714a474dc90f2e58a7bf0aafadbb5 100644 (file)
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any.worker-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any.worker-expected.txt
@@ -1,20 +1,22 @@
 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
 
 PASS Same domain different port [no-cors mode] 
 PASS Same domain different port [server forbid CORS] 
 PASS Same domain different port [cors mode] 
-FAIL Same domain different protocol different port [no-cors mode] promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS Same domain different protocol different port [no-cors mode] 
 PASS Same domain different protocol different port [server forbid CORS] 
-FAIL Same domain different protocol different port [cors mode] promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS Same domain different protocol different port [cors mode] 
 PASS Cross domain basic usage [no-cors mode] 
 PASS Cross domain basic usage [server forbid CORS] 
 PASS Cross domain basic usage [cors mode] 
 PASS Cross domain different port [no-cors mode] 
 PASS Cross domain different port [server forbid CORS] 
 PASS Cross domain different port [cors mode] 
-FAIL Cross domain different protocol [no-cors mode] promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS Cross domain different protocol [no-cors mode] 
 PASS Cross domain different protocol [server forbid CORS] 
-FAIL Cross domain different protocol [cors mode] promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS Cross domain different protocol [cors mode] 
 

diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-no-preflight.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-no-preflight.any-expected.txt
index ec2176232d8cf31cf980f629a22d38b842709687..77881dd4698a76e60f2bbc38adc3d05f8a1bd0dc 100644 (file)
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-no-preflight.any-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-no-preflight.any-expected.txt
@@ -2,8 +2,8 @@
 PASS Cross domain basic usage [GET] 
 PASS Same domain different port [GET] 
 PASS Cross domain different port [GET] 
-FAIL Cross domain different protocol [GET] promise_test: Unhandled rejection with value: object "TypeError: Type error"
-FAIL Same domain different protocol different port [GET] promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS Cross domain different protocol [GET] 
+PASS Same domain different protocol different port [GET] 
 PASS Cross domain [POST] 
 PASS Cross domain [HEAD] 
 PASS Cross domain [GET] [Accept: */*] 

diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-no-preflight.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-no-preflight.any.worker-expected.txt
index ec2176232d8cf31cf980f629a22d38b842709687..77881dd4698a76e60f2bbc38adc3d05f8a1bd0dc 100644 (file)
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-no-preflight.any.worker-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-no-preflight.any.worker-expected.txt
@@ -2,8 +2,8 @@
 PASS Cross domain basic usage [GET] 
 PASS Same domain different port [GET] 
 PASS Cross domain different port [GET] 
-FAIL Cross domain different protocol [GET] promise_test: Unhandled rejection with value: object "TypeError: Type error"
-FAIL Same domain different protocol different port [GET] promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS Cross domain different protocol [GET] 
+PASS Same domain different protocol different port [GET] 
 PASS Cross domain [POST] 
 PASS Cross domain [HEAD] 
 PASS Cross domain [GET] [Accept: */*] 

diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any-expected.txt
index a76f339f51621842345b550fb68d4b0b3e9abd17..60f56e5516604198e63a66d66cc749b45bbbfe39 100644 (file)
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any-expected.txt
@@ -5,9 +5,9 @@ PASS Same domain different port [origin OK]
 PASS Same domain different port [origin KO] 
 PASS Cross domain different port [origin OK] 
 PASS Cross domain different port [origin KO] 
-FAIL Cross domain different protocol [origin OK] promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS Cross domain different protocol [origin OK] 
 PASS Cross domain different protocol [origin KO] 
-FAIL Same domain different protocol different port [origin OK] promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS Same domain different protocol different port [origin OK] 
 PASS Same domain different protocol different port [origin KO] 
 PASS Cross domain [POST] [origin OK] 
 PASS Cross domain [POST] [origin KO] 

diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt
index 7e821b460bfc6b2170e116fe2b61a21c7d2ad5c7..3bceadb4015c6a46952b9fed144c0623e575f25f 100644 (file)
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt
@@ -4,6 +4,8 @@ CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-A
 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
 
 PASS Cross domain different subdomain [origin OK] 
 PASS Cross domain different subdomain [origin KO] 
@@ -11,9 +13,9 @@ PASS Same domain different port [origin OK]
 PASS Same domain different port [origin KO] 
 PASS Cross domain different port [origin OK] 
 PASS Cross domain different port [origin KO] 
-FAIL Cross domain different protocol [origin OK] promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS Cross domain different protocol [origin OK] 
 PASS Cross domain different protocol [origin KO] 
-FAIL Same domain different protocol different port [origin OK] promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS Same domain different protocol different port [origin OK] 
 PASS Same domain different protocol different port [origin KO] 
 PASS Cross domain [POST] [origin OK] 
 PASS Cross domain [POST] [origin KO] 

diff --git a/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt b/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt
deleted file mode 100644 (file)
index 86ba6c8..0000000
--- a/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-PASS Fetch ../resources/top.txt with no-cors mode 
-PASS Fetch http://localhost:8800/fetch/api/resources/top.txt with no-cors mode 
-FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: object "TypeError: Type error"
-PASS Fetch http://localhost:8801/fetch/api/resources/top.txt with no-cors mode 
-

diff --git a/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt b/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt
deleted file mode 100644 (file)
index 86ba6c8..0000000
--- a/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-PASS Fetch ../resources/top.txt with no-cors mode 
-PASS Fetch http://localhost:8800/fetch/api/resources/top.txt with no-cors mode 
-FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: object "TypeError: Type error"
-PASS Fetch http://localhost:8801/fetch/api/resources/top.txt with no-cors mode 
-

diff --git a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt
deleted file mode 100644 (file)
index 8ac4928..0000000
--- a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8801/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load https://127.0.0.1:9443/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-
-PASS Same domain different port [no-cors mode] 
-PASS Same domain different port [server forbid CORS] 
-PASS Same domain different port [cors mode] 
-PASS Same domain different protocol different port [no-cors mode] 
-PASS Same domain different protocol different port [server forbid CORS] 
-PASS Same domain different protocol different port [cors mode] 
-PASS Cross domain basic usage [no-cors mode] 
-PASS Cross domain basic usage [server forbid CORS] 
-PASS Cross domain basic usage [cors mode] 
-PASS Cross domain different port [no-cors mode] 
-PASS Cross domain different port [server forbid CORS] 
-PASS Cross domain different port [cors mode] 
-PASS Cross domain different protocol [no-cors mode] 
-PASS Cross domain different protocol [server forbid CORS] 
-PASS Cross domain different protocol [cors mode] 
-

diff --git a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any.worker-expected.txt b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any.worker-expected.txt
deleted file mode 100644 (file)
index 6bb8ead..0000000
--- a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any.worker-expected.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-
-PASS Same domain different port [no-cors mode] 
-PASS Same domain different port [server forbid CORS] 
-PASS Same domain different port [cors mode] 
-PASS Same domain different protocol different port [no-cors mode] 
-PASS Same domain different protocol different port [server forbid CORS] 
-PASS Same domain different protocol different port [cors mode] 
-PASS Cross domain basic usage [no-cors mode] 
-PASS Cross domain basic usage [server forbid CORS] 
-PASS Cross domain basic usage [cors mode] 
-PASS Cross domain different port [no-cors mode] 
-PASS Cross domain different port [server forbid CORS] 
-PASS Cross domain different port [cors mode] 
-PASS Cross domain different protocol [no-cors mode] 
-PASS Cross domain different protocol [server forbid CORS] 
-PASS Cross domain different protocol [cors mode] 
-

diff --git a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-no-preflight.any-expected.txt b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-no-preflight.any-expected.txt
deleted file mode 100644 (file)
index 77881dd..0000000
--- a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-no-preflight.any-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-PASS Cross domain basic usage [GET] 
-PASS Same domain different port [GET] 
-PASS Cross domain different port [GET] 
-PASS Cross domain different protocol [GET] 
-PASS Same domain different protocol different port [GET] 
-PASS Cross domain [POST] 
-PASS Cross domain [HEAD] 
-PASS Cross domain [GET] [Accept: */*] 
-PASS Cross domain [GET] [Accept-Language: fr] 
-PASS Cross domain [GET] [Content-Language: fr] 
-PASS Cross domain [GET] [Content-Type: application/x-www-form-urlencoded] 
-PASS Cross domain [GET] [Content-Type: multipart/form-data] 
-PASS Cross domain [GET] [Content-Type: text/plain] 
-PASS Cross domain [GET] [Content-Type: text/plain;charset=utf-8] 
-PASS Cross domain [GET] [Content-Type: Text/Plain;charset=utf-8] 
-

diff --git a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any-expected.txt b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any-expected.txt
deleted file mode 100644 (file)
index 60f56e5..0000000
--- a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any-expected.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-PASS Cross domain different subdomain [origin OK] 
-PASS Cross domain different subdomain [origin KO] 
-PASS Same domain different port [origin OK] 
-PASS Same domain different port [origin KO] 
-PASS Cross domain different port [origin OK] 
-PASS Cross domain different port [origin KO] 
-PASS Cross domain different protocol [origin OK] 
-PASS Cross domain different protocol [origin KO] 
-PASS Same domain different protocol different port [origin OK] 
-PASS Same domain different protocol different port [origin KO] 
-PASS Cross domain [POST] [origin OK] 
-PASS Cross domain [POST] [origin KO] 
-PASS Cross domain [HEAD] [origin OK] 
-PASS Cross domain [HEAD] [origin KO] 
-PASS CORS preflight [PUT] [origin OK] 
-PASS CORS preflight [PUT] [origin KO] 
-PASS Allowed origin: "" [origin KO] 
-

diff --git a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt
deleted file mode 100644 (file)
index 3bceadb..0000000
--- a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-
-PASS Cross domain different subdomain [origin OK] 
-PASS Cross domain different subdomain [origin KO] 
-PASS Same domain different port [origin OK] 
-PASS Same domain different port [origin KO] 
-PASS Cross domain different port [origin OK] 
-PASS Cross domain different port [origin KO] 
-PASS Cross domain different protocol [origin OK] 
-PASS Cross domain different protocol [origin KO] 
-PASS Same domain different protocol different port [origin OK] 
-PASS Same domain different protocol different port [origin KO] 
-PASS Cross domain [POST] [origin OK] 
-PASS Cross domain [POST] [origin KO] 
-PASS Cross domain [HEAD] [origin OK] 
-PASS Cross domain [HEAD] [origin KO] 
-PASS CORS preflight [PUT] [origin OK] 
-PASS CORS preflight [PUT] [origin KO] 
-PASS Allowed origin: "" [origin KO] 
-

diff --git a/LayoutTests/platform/mac-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt b/LayoutTests/platform/mac-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt
deleted file mode 100644 (file)
index 86ba6c8..0000000
--- a/LayoutTests/platform/mac-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-PASS Fetch ../resources/top.txt with no-cors mode 
-PASS Fetch http://localhost:8800/fetch/api/resources/top.txt with no-cors mode 
-FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: object "TypeError: Type error"
-PASS Fetch http://localhost:8801/fetch/api/resources/top.txt with no-cors mode 
-

diff --git a/LayoutTests/platform/mac-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt b/LayoutTests/platform/mac-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt
deleted file mode 100644 (file)
index 86ba6c8..0000000
--- a/LayoutTests/platform/mac-wk2/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-PASS Fetch ../resources/top.txt with no-cors mode 
-PASS Fetch http://localhost:8800/fetch/api/resources/top.txt with no-cors mode 
-FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: object "TypeError: Type error"
-PASS Fetch http://localhost:8801/fetch/api/resources/top.txt with no-cors mode 
-

diff --git a/LayoutTests/platform/wk2/TestExpectations b/LayoutTests/platform/wk2/TestExpectations
index ab2d7b2a9cfc93d0e24727af2a44317d71aaa12a..42f7b55ff1cf8efafeed9074d36352da7c4c78d7 100644 (file)
--- a/LayoutTests/platform/wk2/TestExpectations
+++ b/LayoutTests/platform/wk2/TestExpectations
@@ -213,12 +213,6 @@ http/tests/download/default-encoding.html
 http/tests/download/inherited-encoding-form-submission-result.html
 http/tests/download/inherited-encoding.html
 
-# Those tests are loaded over HTTPS and pass locally. However, they get an SSL error on the bots and time out.
-webkit.org/b/175076 imported/w3c/web-platform-tests/beacon/headers/header-referrer-no-referrer-when-downgrade.https.html [ Skip ]
-webkit.org/b/175076 imported/w3c/web-platform-tests/beacon/headers/header-referrer-strict-origin-when-cross-origin.https.html [ Skip ]
-webkit.org/b/175076 imported/w3c/web-platform-tests/beacon/headers/header-referrer-strict-origin.https.html [ Skip ]
-webkit.org/b/175076 imported/w3c/web-platform-tests/beacon/headers/header-referrer-unsafe-url.https.html [ Skip ]
-
 ### END OF (1) Classified failures with bug reports
 ########################################
 

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index c7a175260f4e04e4f68d993113c36078040d26b6..ca9e8b6f022a0db8278cf58f8ef5274da2f39ec3 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2017-08-03  Chris Dumez  <cdumez@apple.com>
+
+        Multiple Layout tests from web-platform-tests/beacon/ are timing out.
+        https://bugs.webkit.org/show_bug.cgi?id=175076
+        <rdar://problem/33704752>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * NetworkProcess/NetworkLoad.cpp:
+        (WebKit::NetworkLoad::completeAuthenticationChallenge):
+        In the NETWORK_SESSION code path, we did not ask the client about server trust evaluation
+        when the clientCredentialPolicy was CannotAskClientForCredentials. This is because the
+        same delegate is used for HTTP authentication and server trust evaluation in the
+        NETWORK_SESSION code path. To align both code paths, we now ask the client about server
+        trust evaluation even if the policy CannotAskClientForCredentials. This allows WKTR
+        to trust certificates for localhost / 127.0.0.1 unconditionally and consistently.
+
 2017-08-03  Yoshiaki Jitsukawa  <jitsu@rd.scei.sony.co.jp>
 
         [PAL] Move spi/cf directory into PAL

diff --git a/Source/WebKit/NetworkProcess/NetworkLoad.cpp b/Source/WebKit/NetworkProcess/NetworkLoad.cpp
index 5173e79c1ffba2443c0d73c6e88dcaccb2154d53..9c8c6c0e6a1077bfb36d63c8a43c77332559e49e 100644 (file)
--- a/Source/WebKit/NetworkProcess/NetworkLoad.cpp
+++ b/Source/WebKit/NetworkProcess/NetworkLoad.cpp
@@ -337,7 +337,8 @@ void NetworkLoad::didReceiveChallenge(const AuthenticationChallenge& challenge,
 
 void NetworkLoad::completeAuthenticationChallenge(ChallengeCompletionHandler&& completionHandler)
 {
-    if (m_parameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials) {
+    bool isServerTrustEvaluation = m_challenge->protectionSpace().authenticationScheme() == ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested;
+    if (m_parameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials && !isServerTrustEvaluation) {
         completionHandler(AuthenticationChallengeDisposition::UseCredential, { });
         return;
     }