Attachment 341612 Details for Bug 183714 – Patch for landing

[patch] Patch for landing

bug-183714-20180530155515.patch (text/plain), 6.07 KB, created by John Wilander on 2018-05-30 15:55:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Wilander

Created: 2018-05-30 15:55:15 PDT

Size: 6.07 KB

patch

obsolete

>Subversion Revision: 232301
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 3aace47a0397a5f0006f6b1a379a38d30a75353a..c2ce49e9c25e0991102a93506f768169f34d6ab8 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-30  John Wilander  <wilander@apple.com>
>+
>+        Add console logging to grant-storage-access-under-opener.html to assess its flakiness
>+        https://bugs.webkit.org/show_bug.cgi?id=183714
>+        <rdar://problem/38666060>
>+
>+        Unreviewed test gardening.
>+
>+        * http/tests/storageAccess/grant-storage-access-under-opener-expected.txt:
>+        * http/tests/storageAccess/grant-storage-access-under-opener.html:
>+            Now outputs console log entries, step by step, to see where the timeouts happen.
>+        * platform/ios-wk2/TestExpectations:
>+            Switched to [ Pass ] on iOS Debug to maximize chance of seeing the flakiness.
>+
> 2018-05-30  Jer Noble  <jer.noble@apple.com>
> 
>         Media elements outside fullscreen should not be considered main content.
>diff --git a/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener-expected.txt b/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener-expected.txt
>index 5fe43c77130f251f4024f7cd5bbd2a7b3783f8bf..530880414211bfb87e316df5b15e421ea218d75f 100644
>--- a/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener-expected.txt
>+++ b/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener-expected.txt
>@@ -1,3 +1,7 @@
>+CONSOLE MESSAGE: line 54: Running test.
>+CONSOLE MESSAGE: line 67: About to call testRunner.statisticsUpdateCookiePartitioning().
>+CONSOLE MESSAGE: line 69: About to open the new window.
>+CONSOLE MESSAGE: line 43: About to open the third party iframe.
> Tests that a cross-origin window from a prevalent domain with non-recent user interaction gets immediate storage access under its opener.
> 
> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>diff --git a/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener.html b/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener.html
>index aa514e33938962f097051f640749579a1ea2158f..1cbd1c77b9b31a2f9cf47984396ac6c772c00513 100644
>--- a/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener.html
>+++ b/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener.html
>@@ -40,33 +40,38 @@
>                 testFailed("Received a message from an unexpected origin: " + event.origin);
> 
>             newWin.close();
>+            console.log("About to open the third party iframe.");
>             openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive first-party cookie.", finishTest);
>         }
> 
>-        setEnableFeature(true);
>-        testRunner.setCanOpenWindows();
>-
>         const thirdPartyOrigin = "http://localhost:8000";
>         const resourcePath = "/storageAccess/resources";
>         const thirdPartyBaseUrl = thirdPartyOrigin + resourcePath;
>         const firstPartyCookieName = "firstPartyCookie";
>         const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName;
>+        var newWin;
>+        function run() {
>+            console.log("Running test.");
>+            setEnableFeature(true);
>+            testRunner.setCanOpenWindows();
> 
>-        testRunner.setStatisticsPrevalentResource(thirdPartyOrigin, true);
>-        if (!testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
>-            testFailed("Host did not get set as prevalent resource.");
>-        testRunner.setStatisticsHasHadNonRecentUserInteraction(thirdPartyOrigin, true);
>-        if (!testRunner.isStatisticsHasHadUserInteraction(thirdPartyOrigin))
>-            testFailed("Host did not get logged for user interaction.");
>-        testRunner.dumpChildFramesAsText();
>-        testRunner.setCloseRemainingWindowsWhenComplete(true);
>+            testRunner.setStatisticsPrevalentResource(thirdPartyOrigin, true);
>+            if (!testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
>+                testFailed("Host did not get set as prevalent resource.");
>+            testRunner.setStatisticsHasHadNonRecentUserInteraction(thirdPartyOrigin, true);
>+            if (!testRunner.isStatisticsHasHadUserInteraction(thirdPartyOrigin))
>+                testFailed("Host did not get logged for user interaction.");
>+            testRunner.dumpChildFramesAsText();
>+            testRunner.setCloseRemainingWindowsWhenComplete(true);
> 
>-        var newWin;
>-        testRunner.statisticsUpdateCookiePartitioning(function () {
>-            newWin = window.open(thirdPartyOrigin + "/storageAccess/resources/set-cookie-and-report-back.html", "testWindow");
>-        });
>+            console.log("About to call testRunner.statisticsUpdateCookiePartitioning().");
>+            testRunner.statisticsUpdateCookiePartitioning(function () {
>+                console.log("About to open the new window.");
>+                newWin = window.open(thirdPartyOrigin + "/storageAccess/resources/set-cookie-and-report-back.html", "testWindow");
>+            });
>+        }
>     </script>
> </head>
>-<body>
>+<body onload="run()">
> </body>
> </html>
>\ No newline at end of file
>diff --git a/LayoutTests/platform/ios-wk2/TestExpectations b/LayoutTests/platform/ios-wk2/TestExpectations
>index 00fcc7e9b2d4fcdd9ef4944187f9649f85d52097..9c2e973da3c73256f6b4c2f2d9f9a70eb0639906 100644
>--- a/LayoutTests/platform/ios-wk2/TestExpectations
>+++ b/LayoutTests/platform/ios-wk2/TestExpectations
>@@ -1346,7 +1346,8 @@ webkit.org/b/182144 [ Debug ] webgl/1.0.3/conformance/rendering/many-draw-calls.
> 
> webkit.org/b/182849 imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin.htm [ Pass Failure ]
> 
>-webkit.org/b/183714 [ Debug ] http/tests/storageAccess/grant-storage-access-under-opener.html [ Skip ]
>+# This is marked as Pass to see if additional logging can reveal the cause of the flakiness.
>+webkit.org/b/183714 [ Debug ] http/tests/storageAccess/grant-storage-access-under-opener.html [ Pass ]
> 
> webkit.org/b/183860 [ Release ] http/wpt/service-workers/third-party-registration.html [ Pass Failure ]
>

Actions: View | Formatted Diff | Diff

Attachments on bug 183714: 341612