REGRESSION (r230326?): Layout Test http/tests/contentextensions/make-https.html is...
authoryouenn@apple.com <youenn@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 May 2018 23:41:55 +0000 (23:41 +0000)
committeryouenn@apple.com <youenn@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 May 2018 23:41:55 +0000 (23:41 +0000)
https://bugs.webkit.org/show_bug.cgi?id=184476
<rdar://problem/39384226>

Reviewed by Ryosuke Niwa.

Removed flakiness expectation.
Updated test to no longer log load callbacks.
Instead, we rely on the fact that the four content extension upgrades
are also logged as console log messages.

* http/tests/contentextensions/make-https-expected.txt:
* http/tests/contentextensions/make-https.html:
* platform/mac-sierra-wk2/http/tests/contentextensions/make-https-expected.txt: Removed.
* platform/mac-wk2/TestExpectations:

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

LayoutTests/ChangeLog
LayoutTests/http/tests/contentextensions/make-https-expected.txt
LayoutTests/http/tests/contentextensions/make-https.html
LayoutTests/platform/mac-sierra-wk2/http/tests/contentextensions/make-https-expected.txt [deleted file]
LayoutTests/platform/mac-wk2/TestExpectations

index 0cb60a7..da731e3 100644 (file)
@@ -1,3 +1,21 @@
+2018-05-04  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION (r230326?): Layout Test http/tests/contentextensions/make-https.html is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=184476
+        <rdar://problem/39384226>
+
+        Reviewed by Ryosuke Niwa.
+
+        Removed flakiness expectation.
+        Updated test to no longer log load callbacks.
+        Instead, we rely on the fact that the four content extension upgrades
+        are also logged as console log messages.
+
+        * http/tests/contentextensions/make-https-expected.txt:
+        * http/tests/contentextensions/make-https.html:
+        * platform/mac-sierra-wk2/http/tests/contentextensions/make-https-expected.txt: Removed.
+        * platform/mac-wk2/TestExpectations:
+
 2018-05-04  Ryan Haddad  <ryanhaddad@apple.com>
 
         Mark animations/duplicate-keys.html as flaky on iOS.
index 030f25a..0c3b99b 100644 (file)
@@ -1,28 +1,6 @@
-http://127.0.0.1:8000/try_to_promote - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/try_to_promote, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-http://127.0.0.1:8000/contentextensions/make-https.html - didFinishLoading
-http://127.0.0.1:8000/try_to_promote - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/try_to_promote, http status code 404>
-http://127.0.0.1:8000/try_to_promote - didFinishLoading
-http://127.0.0.1/nope - willSendRequest <NSURLRequest URL http://127.0.0.1/nope, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-http://127.0.0.1/nope - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://127.0.0.1/nope">
-CONSOLE MESSAGE: line 30: Content blocker promoted URL from http://127.0.0.1/promote to https
-https://127.0.0.1/promote - willSendRequest <NSURLRequest URL https://127.0.0.1/promote, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-https://127.0.0.1/promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1200, failing URL "https://127.0.0.1/promote">
-CONSOLE MESSAGE: line 30: Content blocker promoted URL from http://127.0.0.1/promote to https
-https://127.0.0.1/promote - willSendRequest <NSURLRequest URL https://127.0.0.1/promote, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-https://127.0.0.1/promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1200, failing URL "https://127.0.0.1/promote">
-CONSOLE MESSAGE: line 30: Content blocker promoted URL from http://127.0.0.1/promote to https
-https://127.0.0.1/promote - willSendRequest <NSURLRequest URL https://127.0.0.1/promote, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-https://127.0.0.1/promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1200, failing URL "https://127.0.0.1/promote">
-http://127.0.0.1:443/try_to_promote - willSendRequest <NSURLRequest URL http://127.0.0.1:443/try_to_promote, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-http://127.0.0.1:443/try_to_promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://127.0.0.1:443/try_to_promote">
-http://127.0.0.1:1443/try_to_promote - willSendRequest <NSURLRequest URL http://127.0.0.1:1443/try_to_promote, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-http://127.0.0.1:1443/try_to_promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://127.0.0.1:1443/try_to_promote">
-CONSOLE MESSAGE: line 30: Content blocker promoted URL from http://promote/ to https
-https://promote/ - willSendRequest <NSURLRequest URL https://promote/, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
+CONSOLE MESSAGE: line 29: Content blocker promoted URL from http://127.0.0.1/promote to https
+CONSOLE MESSAGE: line 29: Content blocker promoted URL from http://127.0.0.1/promote to https
+CONSOLE MESSAGE: line 29: Content blocker promoted URL from http://127.0.0.1/promote to https
+CONSOLE MESSAGE: line 29: Content blocker promoted URL from http://promote/ to https
 Blocked access to external URL https://promote/
-https://promote/ - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999>
-protocol://try_to_promote - willSendRequest <NSURLRequest URL protocol://try_to_promote, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-protocol://try_to_promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1002, failing URL "protocol://try_to_promote">
-https://127.0.0.1/already_promoted - willSendRequest <NSURLRequest URL https://127.0.0.1/already_promoted, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-https://127.0.0.1/already_promoted - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1200, failing URL "https://127.0.0.1/already_promoted">
-URLs with http, port 80, and promote in the url should be promoted to https with port 443.
+URLs with http, port 80, and promote in the url should be promoted to https with port 443. Four URLs should be promoted as should be shown by four CONSOLE MESSAGE lines.
index bc865f1..6a3614b 100644 (file)
@@ -1,7 +1,6 @@
 <head>
 <script>
 if(window.testRunner) {
-    testRunner.dumpResourceLoadCallbacks();
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
 }
@@ -37,4 +36,5 @@ function bodyLoaded() {
 </head>
 <body onload="bodyLoaded();">
 URLs with http, port 80, and promote in the url should be promoted to https with port 443.
+Four URLs should be promoted as should be shown by four CONSOLE MESSAGE lines.
 </body>
diff --git a/LayoutTests/platform/mac-sierra-wk2/http/tests/contentextensions/make-https-expected.txt b/LayoutTests/platform/mac-sierra-wk2/http/tests/contentextensions/make-https-expected.txt
deleted file mode 100644 (file)
index ee7a252..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-http://127.0.0.1:8000/try_to_promote - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/try_to_promote, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-http://127.0.0.1:8000/contentextensions/make-https.html - didFinishLoading
-http://127.0.0.1:8000/try_to_promote - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/try_to_promote, http status code 404>
-http://127.0.0.1:8000/try_to_promote - didFinishLoading
-http://127.0.0.1/nope - willSendRequest <NSURLRequest URL http://127.0.0.1/nope, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-http://127.0.0.1/nope - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://127.0.0.1/nope">
-CONSOLE MESSAGE: line 30: Content blocker promoted URL from http://127.0.0.1/promote to https
-https://127.0.0.1/promote - willSendRequest <NSURLRequest URL https://127.0.0.1/promote, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-https://127.0.0.1/promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "https://127.0.0.1/promote">
-CONSOLE MESSAGE: line 30: Content blocker promoted URL from http://127.0.0.1/promote to https
-https://127.0.0.1/promote - willSendRequest <NSURLRequest URL https://127.0.0.1/promote, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-https://127.0.0.1/promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "https://127.0.0.1/promote">
-CONSOLE MESSAGE: line 30: Content blocker promoted URL from http://127.0.0.1/promote to https
-https://127.0.0.1/promote - willSendRequest <NSURLRequest URL https://127.0.0.1/promote, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-https://127.0.0.1/promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "https://127.0.0.1/promote">
-http://127.0.0.1:443/try_to_promote - willSendRequest <NSURLRequest URL http://127.0.0.1:443/try_to_promote, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-http://127.0.0.1:443/try_to_promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://127.0.0.1:443/try_to_promote">
-http://127.0.0.1:1443/try_to_promote - willSendRequest <NSURLRequest URL http://127.0.0.1:1443/try_to_promote, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-http://127.0.0.1:1443/try_to_promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://127.0.0.1:1443/try_to_promote">
-CONSOLE MESSAGE: line 30: Content blocker promoted URL from http://promote/ to https
-https://promote/ - willSendRequest <NSURLRequest URL https://promote/, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-Blocked access to external URL https://promote/
-https://promote/ - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999>
-protocol://try_to_promote - willSendRequest <NSURLRequest URL protocol://try_to_promote, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-protocol://try_to_promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1002, failing URL "protocol://try_to_promote">
-https://127.0.0.1/already_promoted - willSendRequest <NSURLRequest URL https://127.0.0.1/already_promoted, main document URL http://127.0.0.1:8000/contentextensions/make-https.html, http method GET> redirectResponse (null)
-https://127.0.0.1/already_promoted - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "https://127.0.0.1/already_promoted">
-URLs with http, port 80, and promote in the url should be promoted to https with port 443.
index 4505d4c..891908e 100644 (file)
@@ -888,5 +888,3 @@ webkit.org/b/177380 http/tests/cache-storage/cache-records-persistency.https.htm
 webkit.org/b/184469 http/wpt/service-workers/header-filtering.https.html [ Pass Failure ]
 
 webkit.org/b/184937 transitions/opacity-transition-zindex.html [ Skip ]
-
-webkit.org/b/184476 [ HighSierra+ ] http/tests/contentextensions/make-https.html [ Pass Failure ]