Attachment 339593 Details for Bug 184476 – Patch

[patch] Patch

bug-184476-20180504141010.patch (text/plain), 12.05 KB, created by youenn fablet on 2018-05-04 14:10:11 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2018-05-04 14:10:11 PDT

Size: 12.05 KB

patch

obsolete

>Subversion Revision: 231370
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 1d07542d10208c4dc99556c9d6b34aa8cc8b288c..e45da7f840ff999b3d2d98a320f6b42532d5fa16 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -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 NOBODY (OOPS!).
>+
>+        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  Devin Rousso  <webkit@devinrousso.com>
> 
>         Web Inspector: Canvas tab: Determine isFunction by looking at the prototype
>diff --git a/LayoutTests/http/tests/contentextensions/make-https-expected.txt b/LayoutTests/http/tests/contentextensions/make-https-expected.txt
>index 030f25a9b990acebab6be93995d5580ee90d073b..0c3b99bfb8e01bbf33d15d177d8e827af8f67ad0 100644
>--- a/LayoutTests/http/tests/contentextensions/make-https-expected.txt
>+++ b/LayoutTests/http/tests/contentextensions/make-https-expected.txt
>@@ -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.
>diff --git a/LayoutTests/http/tests/contentextensions/make-https.html b/LayoutTests/http/tests/contentextensions/make-https.html
>index bc865f1a45d1fc3c3b8819588d3b46ff9fc8e1f9..6a3614bb0bbcc523a6ee7a7336ee9795b1f616ad 100644
>--- a/LayoutTests/http/tests/contentextensions/make-https.html
>+++ b/LayoutTests/http/tests/contentextensions/make-https.html
>@@ -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
>index ee7a2523c0bc625d089c7ba8bf04b447737ba840..0000000000000000000000000000000000000000
>--- a/LayoutTests/platform/mac-sierra-wk2/http/tests/contentextensions/make-https-expected.txt
>+++ /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.
>diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
>index 4505d4c2521614091519942b0b4fd823261d5c83..891908e0f3cace490b3858cb0bf68dba5f59dc80 100644
>--- a/LayoutTests/platform/mac-wk2/TestExpectations
>+++ b/LayoutTests/platform/mac-wk2/TestExpectations
>@@ -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 ]

Actions: View | Formatted Diff | Diff

Attachments on bug 184476: 339583 | 339590 | 339593