Attachment 359100 Details for Bug 191211 – Patch for landing

[patch] Patch for landing

bug-191211-20190114171344.patch (text/plain), 4.82 KB, created by John Wilander on 2019-01-14 17:13:45 PST

(hide)

Description:

Filename:

MIME Type:

Creator: John Wilander

Created: 2019-01-14 17:13:45 PST

Size: 4.82 KB

patch

obsolete

>Subversion Revision: 239959
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index b622ccb4eaa67653615250f1a7947fb9bf8eddd0..cea0ff488ed27dcd4d220dc7c79141808ad24050 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-01-14  John Wilander  <wilander@apple.com>
>+
>+        Restructure http/tests/resourceLoadStatistics/remove-blocking-in-redirect.html to address flakiness
>+        https://bugs.webkit.org/show_bug.cgi?id=191211
>+        <rdar://problem/45818606>
>+
>+        Unreviewed test gardening.
>+
>+        This test is flaky on the MacOS WK2 bot. The patch avoids a page navigation and
>+        redirect which may avoid the code that changed in
>+        https://trac.webkit.org/changeset/237735/webkit and made the test more flaky.
>+
>+        * http/tests/resourceLoadStatistics/remove-blocking-in-redirect-expected.txt:
>+        * http/tests/resourceLoadStatistics/remove-blocking-in-redirect.html:
>+
> 2019-01-14  Charles Vazac  <cvazac@akamai.com>
> 
>         Import current Resource-Timing WPTs
>diff --git a/LayoutTests/http/tests/resourceLoadStatistics/remove-blocking-in-redirect-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/remove-blocking-in-redirect-expected.txt
>index 2d8d99b94312603b2ea3ec1d74b1abb58acab0b2..fea82320c2afc0318bdf278d47dc0a603ec7e5a8 100644
>--- a/LayoutTests/http/tests/resourceLoadStatistics/remove-blocking-in-redirect-expected.txt
>+++ b/LayoutTests/http/tests/resourceLoadStatistics/remove-blocking-in-redirect-expected.txt
>@@ -11,13 +11,19 @@ TEST COMPLETE
> --------
> Frame: ''
> --------
>+Set cookie.
>+
>+
>+--------
>+Frame: ''
>+--------
> Should receive first-party cookie.
> Received cookie named 'firstPartyCookie'.
> Did not receive cookie named 'partitionedCookie'.
> Client-side document.cookie: firstPartyCookie=value
> 
> --------
>-Frame: ''
>+Frame: ''
> --------
> Redirect case 1, should receive first-party cookie for 127.0.0.1.
> Received cookie named 'firstPartyCookie'.
>@@ -25,13 +31,13 @@ Did not receive cookie named 'partitionedCookie'.
> Client-side document.cookie: firstPartyCookie=127.0.0.1
> 
> --------
>-Frame: ''
>+Frame: ''
> --------
> Try to set third-party cookie in blocked mode.
> 
> 
> --------
>-Frame: ''
>+Frame: ''
> --------
> Should receive no cookie.
> Did not receive cookie named 'firstPartyCookie'.
>@@ -39,7 +45,7 @@ Did not receive cookie named 'partitionedCookie'.
> Client-side document.cookie:
> 
> --------
>-Frame: ''
>+Frame: ''
> --------
> Redirect case 2, should receive first-party cookie for 127.0.0.1.
> Received cookie named 'firstPartyCookie'.
>diff --git a/LayoutTests/http/tests/resourceLoadStatistics/remove-blocking-in-redirect.html b/LayoutTests/http/tests/resourceLoadStatistics/remove-blocking-in-redirect.html
>index 61c7f1764dd505b164d16fad625c1d4bc7dc10db..f103b7b6bbbf17c40ef28817644273c81a149d15 100644
>--- a/LayoutTests/http/tests/resourceLoadStatistics/remove-blocking-in-redirect.html
>+++ b/LayoutTests/http/tests/resourceLoadStatistics/remove-blocking-in-redirect.html
>@@ -18,7 +18,6 @@
>     const subPathToSetFirstPartyCookie = "/set-cookie.php?name=" + firstPartyCookieName + "&value=value";
>     const partitionedCookieName = "partitionedCookie";
>     const subPathToSetPartitionedCookie = "/set-cookie.php?name=" + partitionedCookieName + "&value=value";
>-    const returnUrl = "http://" + partitionHost + "/resourceLoadStatistics/remove-blocking-in-redirect.html";
>     const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName + "&name2=" + partitionedCookieName;
>     const redirectChainUrl = thirdPartyOrigin + resourcePath + "/redirect.php?redirectTo=http://" + partitionHost + resourcePath + subPathToGetCookies;
> 
>@@ -35,12 +34,17 @@
>         switch (document.location.hash) {
>             case "#step1":
>                 // Set first-party cookies for 127.0.0.1 and localhost.
>+                document.location.hash = "step2";
>                 document.cookie = firstPartyCookieName + "=127.0.0.1;path='/'";
>-                document.location.href = thirdPartyBaseUrl + subPathToSetFirstPartyCookie + "#" + returnUrl + "#step2";
>+                if (window.testRunner)
>+                    testRunner.setAlwaysAcceptCookies(true);
>+                openIframe(thirdPartyBaseUrl + subPathToSetFirstPartyCookie + "&message=Set cookie.", runTest);
>                 break;
>             case "#step2":
>                 // Check that the cookie gets sent for localhost under 127.0.0.1 since localhost is not prevalent.
>                 document.location.hash = "step3";
>+                if (window.testRunner)
>+                    testRunner.setAlwaysAcceptCookies(false);
>                 openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive first-party cookie.", runTest);
>                 break;
>             case "#step3":

Actions: View | Formatted Diff | Diff

Attachments on bug 191211: 359094 | 359100