Changeset 252720 in webkit

Timestamp:

Nov 20, 2019, 5:09:23 PM (7 years ago)

Author:

Kate Cheney

Message:

[ Jazz ] http/tests/resourceLoadStatistics/cookie-deletion.html is timing out
​https://bugs.webkit.org/show_bug.cgi?id=203813
<rdar://problem/54316765>

Reviewed by John Wilander.

Added random dummy value to the end of the cookie-redirect query to ensure
the third party url isn't failing to set the cookie and redirect back
to the correct file because the url is already in the cache from previous runs.

• http/tests/resourceLoadStatistics/cookie-deletion-expected.txt:
• http/tests/resourceLoadStatistics/cookie-deletion.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/resourceLoadStatistics/cookie-deletion-expected.txt (modified) (1 diff)
• http/tests/resourceLoadStatistics/cookie-deletion.html (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-11-20  Kate Cheney  <katherine_cheney@apple.com>
+
+        [ Jazz ] http/tests/resourceLoadStatistics/cookie-deletion.html is timing out
+        https://bugs.webkit.org/show_bug.cgi?id=203813
+        <rdar://problem/54316765>
+
+        Reviewed by John Wilander.
+
+        Added random dummy value to the end of the cookie-redirect query to ensure
+        the third party url isn't failing to set the cookie and redirect back
+        to the correct file because the url is already in the cache from previous runs.
+
+        * http/tests/resourceLoadStatistics/cookie-deletion-expected.txt:
+        * http/tests/resourceLoadStatistics/cookie-deletion.html:
+
 2019-11-20  Zalan Bujtas  <zalan@apple.com>
 

trunk/LayoutTests/http/tests/resourceLoadStatistics/cookie-deletion-expected.txt

@@ -1 @@
-CONSOLE MESSAGE: line 116: Test is beginning. document.location.hash is empty.
-CONSOLE MESSAGE: line 122: About to call runTest() for the first time.
-CONSOLE MESSAGE: line 61: step1. About to set a cookie
-CONSOLE MESSAGE: line 126: About to call runTest() after cookie was set. document hash is #step2
-CONSOLE MESSAGE: line 66: step2. About to open an iFrame to test for third party cookie access (should be successful)
-CONSOLE MESSAGE: line 72: step3. About to classify localhost as prevalent
-CONSOLE MESSAGE: line 76: step3. In the callback for testRunner.setStatisticsPrevalentResource
-CONSOLE MESSAGE: line 83: step4. About to open an iFrame to test for third party cookie access (should not be successful)
-CONSOLE MESSAGE: line 89: step5. About to open an iFrame to try to set a cookie as a third party (should fail)
-CONSOLE MESSAGE: line 95: step6. About to open an iFrame and fireDataModificationHandlerAndContinue
-CONSOLE MESSAGE: line 39: In fireDataModificationHandlerAndContinue
-CONSOLE MESSAGE: line 44: Calling statisticsProcessStatisticsAndDataRecords
-CONSOLE MESSAGE: line 41: In callback function for installStatisticsDidScanDataRecordsCallback
-CONSOLE MESSAGE: line 101: step7. About to open an iFrame and setAsNonPrevalentAndContinue
-CONSOLE MESSAGE: line 49: In setAsNonPrevalentAndContinue
-CONSOLE MESSAGE: line 51: In callback function for setStatisticsPrevalentResource
-CONSOLE MESSAGE: line 107: step8. About to open an iFrame and confirm third party has no cookie access
-CONSOLE MESSAGE: line 24: in finishTest
+CONSOLE MESSAGE: line 117: Test is beginning. document.location.hash is empty.
+CONSOLE MESSAGE: line 123: About to call runTest() for the first time.
+CONSOLE MESSAGE: line 62: step1. About to set a cookie
+CONSOLE MESSAGE: line 127: About to call runTest() after cookie was set. document hash is #step2
+CONSOLE MESSAGE: line 67: step2. About to open an iFrame to test for third party cookie access (should be successful)
+CONSOLE MESSAGE: line 73: step3. About to classify localhost as prevalent
+CONSOLE MESSAGE: line 77: step3. In the callback for testRunner.setStatisticsPrevalentResource
+CONSOLE MESSAGE: line 84: step4. About to open an iFrame to test for third party cookie access (should not be successful)
+CONSOLE MESSAGE: line 90: step5. About to open an iFrame to try to set a cookie as a third party (should fail)
+CONSOLE MESSAGE: line 96: step6. About to open an iFrame and fireDataModificationHandlerAndContinue
+CONSOLE MESSAGE: line 40: In fireDataModificationHandlerAndContinue
+CONSOLE MESSAGE: line 45: Calling statisticsProcessStatisticsAndDataRecords
+CONSOLE MESSAGE: line 42: In callback function for installStatisticsDidScanDataRecordsCallback
+CONSOLE MESSAGE: line 102: step7. About to open an iFrame and setAsNonPrevalentAndContinue
+CONSOLE MESSAGE: line 50: In setAsNonPrevalentAndContinue
+CONSOLE MESSAGE: line 52: In callback function for setStatisticsPrevalentResource
+CONSOLE MESSAGE: line 108: step8. About to open an iFrame and confirm third party has no cookie access
+CONSOLE MESSAGE: line 25: in finishTest
 Test for partitioned and unpartitioned cookie deletion.
 

trunk/LayoutTests/http/tests/resourceLoadStatistics/cookie-deletion.html

@@ -16 +16 @@
     const firstPartyCookieName = "firstPartyCookie";
     const subPathToSetFirstPartyCookie = "/set-cookie.php?name=" + firstPartyCookieName + "&value=value";
+    const subPathToSetFirstPartyCookieRandom = "/set-cookie.php?name=" + firstPartyCookieName + "&value=value&dummyParam=" + Math.random();
     const thirdPartyCookieName = "thirdPartyCookie";
     const subPathToSetThirdPartyCookie = "/set-cookie.php?name=" + thirdPartyCookieName + "&value=value";
@@ -61 +62 @@
                 console.log("step1. About to set a cookie")
                 // Set first-party cookie for localhost.
-                document.location.href = thirdPartyBaseUrl + subPathToSetFirstPartyCookie + "#" + fragmentWithReturnUrl + "#step2";
+                document.location.href = thirdPartyBaseUrl + subPathToSetFirstPartyCookieRandom + "#" + fragmentWithReturnUrl + "#step2";
                 break;
             case "#step2":