Diff
Modified: trunk/LayoutTests/ChangeLog (224030 => 224031)
--- trunk/LayoutTests/ChangeLog 2017-10-26 18:38:54 UTC (rev 224030)
+++ trunk/LayoutTests/ChangeLog 2017-10-26 18:41:35 UTC (rev 224031)
@@ -1,3 +1,25 @@
+2017-10-25 Alex Christensen <[email protected]>
+
+ Rebase contentextensions test expectations
+ https://bugs.webkit.org/show_bug.cgi?id=178841
+
+ Reviewed by Alexey Proskuryakov.
+
+ They've been marked as flaky for so long that nobody has rebased them. The URLParser
+ has changed underneath them, DOM error reporting has changed, etc. The first step to
+ gaining this test coverage back again is rebasing.
+
+ * http/tests/contentextensions/block-everything-if-domain-expected.txt:
+ * http/tests/contentextensions/block-everything-unless-domain-redirect-expected.txt:
+ * http/tests/contentextensions/character-set-basic-support-expected.txt:
+ * http/tests/contentextensions/main-resource-expected.txt:
+ * http/tests/contentextensions/main-resource-redirect-blocked-expected.txt:
+ * http/tests/contentextensions/main-resource-redirect-error-expected.txt:
+ * http/tests/contentextensions/make-https-expected.txt:
+ * http/tests/contentextensions/plugin-doesnt-crash-expected.txt:
+ * http/tests/contentextensions/sync-xhr-blocked-expected.txt:
+ * http/tests/contentextensions/text-track-blocked-expected.txt:
+
2017-10-26 Matt Lewis <[email protected]>
Skipped webrtc/video-replace-muted-track.html on iOS.
Modified: trunk/LayoutTests/http/tests/contentextensions/block-everything-if-domain-expected.txt (224030 => 224031)
--- trunk/LayoutTests/http/tests/contentextensions/block-everything-if-domain-expected.txt 2017-10-26 18:38:54 UTC (rev 224030)
+++ trunk/LayoutTests/http/tests/contentextensions/block-everything-if-domain-expected.txt 2017-10-26 18:41:35 UTC (rev 224031)
@@ -1 +1,6 @@
CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/block-everything-if-domain.html from loading a resource from http://127.0.0.1:8000/contentextensions/block-everything-if-domain.html
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
Modified: trunk/LayoutTests/http/tests/contentextensions/block-everything-unless-domain-redirect-expected.txt (224030 => 224031)
--- trunk/LayoutTests/http/tests/contentextensions/block-everything-unless-domain-redirect-expected.txt 2017-10-26 18:38:54 UTC (rev 224030)
+++ trunk/LayoutTests/http/tests/contentextensions/block-everything-unless-domain-redirect-expected.txt 2017-10-26 18:41:35 UTC (rev 224031)
@@ -1 +1,6 @@
CONSOLE MESSAGE: Content blocker prevented frame displaying http://localhost/contentextensions/resources/should-not-load.html from loading a resource from http://localhost/contentextensions/resources/should-not-load.html
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
Modified: trunk/LayoutTests/http/tests/contentextensions/character-set-basic-support-expected.txt (224030 => 224031)
--- trunk/LayoutTests/http/tests/contentextensions/character-set-basic-support-expected.txt 2017-10-26 18:38:54 UTC (rev 224030)
+++ trunk/LayoutTests/http/tests/contentextensions/character-set-basic-support-expected.txt 2017-10-26 18:41:35 UTC (rev 224031)
@@ -1,7 +1,11 @@
CONSOLE MESSAGE: line 25: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/character-set-basic-support.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?BaSiC-TeSt-cAsE
+CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://127.0.0.1:8000/resources/square100.png?BaSiC-TeSt-cAsE. Resource blocked by content blocker
CONSOLE MESSAGE: line 25: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/character-set-basic-support.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?any-scheme-matcher
+CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://127.0.0.1:8000/resources/square100.png?any-scheme-matcher. Resource blocked by content blocker
CONSOLE MESSAGE: line 25: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/character-set-basic-support.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?casesensitive
+CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://127.0.0.1:8000/resources/square100.png?casesensitive. Resource blocked by content blocker
CONSOLE MESSAGE: line 25: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/character-set-basic-support.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?caseSeNsitive
+CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://127.0.0.1:8000/resources/square100.png?caseSeNsitive. Resource blocked by content blocker
Test basic cases of filter using a character set (e.g. [a-z]).
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Modified: trunk/LayoutTests/http/tests/contentextensions/main-resource-expected.txt (224030 => 224031)
--- trunk/LayoutTests/http/tests/contentextensions/main-resource-expected.txt 2017-10-26 18:38:54 UTC (rev 224030)
+++ trunk/LayoutTests/http/tests/contentextensions/main-resource-expected.txt 2017-10-26 18:41:35 UTC (rev 224031)
@@ -6,3 +6,4 @@
CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/resources/should-not-load.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/should-not-load.html
main frame - didFailProvisionalLoadWithError
main frame - (kWKErrorCodeFrameLoadBlockedByContentBlocker)
+
Modified: trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked-expected.txt (224030 => 224031)
--- trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked-expected.txt 2017-10-26 18:38:54 UTC (rev 224030)
+++ trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked-expected.txt 2017-10-26 18:41:35 UTC (rev 224031)
@@ -1 +1,6 @@
CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/resources/main-resource-redirect-blocked-target.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/main-resource-redirect-blocked-target.html
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
Modified: trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-error-expected.txt (224030 => 224031)
--- trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-error-expected.txt 2017-10-26 18:38:54 UTC (rev 224030)
+++ trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-error-expected.txt 2017-10-26 18:41:35 UTC (rev 224031)
@@ -7,3 +7,4 @@
CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/resources/should-not-load.html from loading a resource from http://127.0.0.1:8000/resources/should-not-load.html
main frame - didFailProvisionalLoadWithError
main frame - (kWKErrorCodeFrameLoadBlockedByContentBlocker)
+
Modified: trunk/LayoutTests/http/tests/contentextensions/make-https-expected.txt (224030 => 224031)
--- trunk/LayoutTests/http/tests/contentextensions/make-https-expected.txt 2017-10-26 18:38:54 UTC (rev 224030)
+++ trunk/LayoutTests/http/tests/contentextensions/make-https-expected.txt 2017-10-26 18:41:35 UTC (rev 224031)
@@ -6,13 +6,13 @@
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">
+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 -1004, failing URL "https://127.0.0.1/promote">
+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 -1004, failing URL "https://127.0.0.1/promote">
+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)
@@ -21,8 +21,8 @@
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/">
+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">
+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.
Modified: trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash-expected.txt (224030 => 224031)
--- trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash-expected.txt 2017-10-26 18:38:54 UTC (rev 224030)
+++ trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash-expected.txt 2017-10-26 18:41:35 UTC (rev 224031)
@@ -1,2 +1 @@
-CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/plugin-doesnt-crash.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/load-me-1.txt
This tests that NPN_GetURLNotify works as expected and does not ASSERT intermittently in debug builds.
Modified: trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked-expected.txt (224030 => 224031)
--- trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked-expected.txt 2017-10-26 18:38:54 UTC (rev 224030)
+++ trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked-expected.txt 2017-10-26 18:41:35 UTC (rev 224031)
@@ -2,5 +2,5 @@
CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js.
Synchronous status: 0, readyState:1, responseText:
Synchronous status: 0, readyState:4, responseText:
-Synchronous error: NetworkError (DOM Exception 19): A network error occurred.
+Synchronous error: NetworkError: A network error occurred.
Modified: trunk/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt (224030 => 224031)
--- trunk/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt 2017-10-26 18:38:54 UTC (rev 224030)
+++ trunk/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt 2017-10-26 18:41:35 UTC (rev 224031)
@@ -13,6 +13,6 @@
layer at (8,26) size 320x240
RenderVideo {VIDEO} at (0,18) size 320x240
layer at (8,26) size 320x240
- RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,256) size 320x10
- RenderButton {BUTTON} at (0,230) size 320x10
+ RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,26) size 320x240
+ RenderBlock (positioned) {DIV} at (0,0) size 320x240
