Changeset 224031 in webkit


Ignore:
Timestamp:
Oct 26, 2017 11:41:35 AM (6 years ago)
Author:
achristensen@apple.com
Message:

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:
Location:
trunk/LayoutTests
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r224028 r224031  
     12017-10-25  Alex Christensen  <achristensen@webkit.org>
     2
     3        Rebase contentextensions test expectations
     4        https://bugs.webkit.org/show_bug.cgi?id=178841
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        They've been marked as flaky for so long that nobody has rebased them.  The URLParser
     9        has changed underneath them, DOM error reporting has changed, etc.  The first step to
     10        gaining this test coverage back again is rebasing.
     11
     12        * http/tests/contentextensions/block-everything-if-domain-expected.txt:
     13        * http/tests/contentextensions/block-everything-unless-domain-redirect-expected.txt:
     14        * http/tests/contentextensions/character-set-basic-support-expected.txt:
     15        * http/tests/contentextensions/main-resource-expected.txt:
     16        * http/tests/contentextensions/main-resource-redirect-blocked-expected.txt:
     17        * http/tests/contentextensions/main-resource-redirect-error-expected.txt:
     18        * http/tests/contentextensions/make-https-expected.txt:
     19        * http/tests/contentextensions/plugin-doesnt-crash-expected.txt:
     20        * http/tests/contentextensions/sync-xhr-blocked-expected.txt:
     21        * http/tests/contentextensions/text-track-blocked-expected.txt:
     22
    1232017-10-26  Matt Lewis  <jlewis3@apple.com>
    224

  • trunk/LayoutTests/http/tests/contentextensions/block-everything-if-domain-expected.txt

    r200461 r224031  
    11CONSOLE 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
     2layer at (0,0) size 800x600
     3  RenderView at (0,0) size 800x600
     4layer at (0,0) size 800x600
     5  RenderBlock {HTML} at (0,0) size 800x600
     6    RenderBody {BODY} at (8,8) size 784x584

  • trunk/LayoutTests/http/tests/contentextensions/block-everything-unless-domain-redirect-expected.txt

    r186807 r224031  
    11CONSOLE 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
     2layer at (0,0) size 800x600
     3  RenderView at (0,0) size 800x600
     4layer at (0,0) size 800x600
     5  RenderBlock {HTML} at (0,0) size 800x600
     6    RenderBody {BODY} at (8,8) size 784x584

  • trunk/LayoutTests/http/tests/contentextensions/character-set-basic-support-expected.txt

    r185714 r224031  
    11CONSOLE 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
     2CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://127.0.0.1:8000/resources/square100.png?BaSiC-TeSt-cAsE. Resource blocked by content blocker
    23CONSOLE 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
     4CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://127.0.0.1:8000/resources/square100.png?any-scheme-matcher. Resource blocked by content blocker
    35CONSOLE 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
     6CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://127.0.0.1:8000/resources/square100.png?casesensitive. Resource blocked by content blocker
    47CONSOLE 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
     8CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://127.0.0.1:8000/resources/square100.png?caseSeNsitive. Resource blocked by content blocker
    59Test basic cases of filter using a character set (e.g. [a-z]).
    610

  • trunk/LayoutTests/http/tests/contentextensions/main-resource-expected.txt

    r200461 r224031  
    77main frame - didFailProvisionalLoadWithError
    88main frame - (kWKErrorCodeFrameLoadBlockedByContentBlocker)
     9

  • trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked-expected.txt

    r186807 r224031  
    11CONSOLE 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
     2layer at (0,0) size 800x600
     3  RenderView at (0,0) size 800x600
     4layer at (0,0) size 800x600
     5  RenderBlock {HTML} at (0,0) size 800x600
     6    RenderBody {BODY} at (8,8) size 784x584

  • trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-error-expected.txt

    r200461 r224031  
    88main frame - didFailProvisionalLoadWithError
    99main frame - (kWKErrorCodeFrameLoadBlockedByContentBlocker)
     10

  • trunk/LayoutTests/http/tests/contentextensions/make-https-expected.txt

    r207162 r224031  
    77CONSOLE MESSAGE: line 30: Content blocker promoted URL from http://127.0.0.1/promote to https
    88https://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)
    9 https://127.0.0.1/promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "https://127.0.0.1/promote">
     9https://127.0.0.1/promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1200, failing URL "https://127.0.0.1/promote">
    1010CONSOLE MESSAGE: line 30: Content blocker promoted URL from http://127.0.0.1/promote to https
    1111https://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)
    12 https://127.0.0.1/promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "https://127.0.0.1/promote">
     12https://127.0.0.1/promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1200, failing URL "https://127.0.0.1/promote">
    1313CONSOLE MESSAGE: line 30: Content blocker promoted URL from http://127.0.0.1/promote to https
    1414https://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)
    15 https://127.0.0.1/promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "https://127.0.0.1/promote">
     15https://127.0.0.1/promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1200, failing URL "https://127.0.0.1/promote">
    1616http://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)
    1717http://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">
    … …  
    2222Blocked access to external URL https://promote/
    2323https://promote/ - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999>
    24 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)
    25 protocol://try_to_promote/ - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1002, failing URL "protocol://try_to_promote/">
     24protocol://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)
     25protocol://try_to_promote - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1002, failing URL "protocol://try_to_promote">
    2626https://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)
    27 https://127.0.0.1/already_promoted - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "https://127.0.0.1/already_promoted">
     27https://127.0.0.1/already_promoted - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1200, failing URL "https://127.0.0.1/already_promoted">
    2828URLs with http, port 80, and promote in the url should be promoted to https with port 443.

  • trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash-expected.txt

    r186597 r224031  
    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
    21This tests that NPN_GetURLNotify works as expected and does not ASSERT intermittently in debug builds.

  • trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked-expected.txt

    r203333 r224031  
    33Synchronous status: 0, readyState:1, responseText:
    44Synchronous status: 0, readyState:4, responseText:
    5 Synchronous error: NetworkError (DOM Exception 19): A network error occurred.
     5Synchronous error: NetworkError: A network error occurred.
    66

  • trunk/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt

    r188213 r224031  
    1414  RenderVideo {VIDEO} at (0,18) size 320x240
    1515layer at (8,26) size 320x240
    16   RenderFlexibleBox {DIV} at (0,0) size 320x240
    17 layer at (8,256) size 320x10
    18   RenderButton {BUTTON} at (0,230) size 320x10
     16  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
     17layer at (8,26) size 320x240
     18  RenderBlock (positioned) {DIV} at (0,0) size 320x240
Note: See TracChangeset for help on using the changeset viewer.