Changeset 262006 in webkit

Timestamp:

May 21, 2020 9:16:41 AM (4 years ago)

Author:

Kate Cheney

Message:

Some http/tests/in-app-browser-privacy/ tests are timing out or failing
​https://bugs.webkit.org/show_bug.cgi?id=212176
<rdar://problem/63452877>

Reviewed by Maciej Stachowiak.

These tests rely on a new network session load for each test resource.
When run in iterations, caching occurs, and the resource does not get
a new network session. This patch adds a random decoration value and
reloads each resource to ensure it is not cached.

• http/tests/in-app-browser-privacy/app-bound-domain-gets-app-bound-session.html:
• http/tests/in-app-browser-privacy/non-app-bound-domain-does-not-get-app-bound-session.html:
• http/tests/in-app-browser-privacy/non-app-bound-iframe-under-app-bound-domain-is-app-bound.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/in-app-browser-privacy/app-bound-domain-gets-app-bound-session.html (modified) (1 diff)
• http/tests/in-app-browser-privacy/non-app-bound-domain-does-not-get-app-bound-session.html (modified) (1 diff)
• http/tests/in-app-browser-privacy/non-app-bound-iframe-under-app-bound-domain-is-app-bound.html (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-05-21  Kate Cheney  <katherine_cheney@apple.com>
+
+        Some http/tests/in-app-browser-privacy/ tests are timing out or failing
+        https://bugs.webkit.org/show_bug.cgi?id=212176
+        <rdar://problem/63452877>
+
+        Reviewed by Maciej Stachowiak.
+
+        These tests rely on a new network session load for each test resource.
+        When run in iterations, caching occurs, and the resource does not get
+        a new network session. This patch adds a random decoration value and
+        reloads each resource to ensure it is not cached.
+
+        * http/tests/in-app-browser-privacy/app-bound-domain-gets-app-bound-session.html:
+        * http/tests/in-app-browser-privacy/non-app-bound-domain-does-not-get-app-bound-session.html:
+        * http/tests/in-app-browser-privacy/non-app-bound-iframe-under-app-bound-domain-is-app-bound.html:
+
 2020-05-21  Kenneth Russell  <kbr@chromium.org>
 

trunk/LayoutTests/http/tests/in-app-browser-privacy/app-bound-domain-gets-app-bound-session.html

@@ -10 +10 @@
     description("Tests that an app-bound domain has an app-bound session.");
     jsTestIsAsync = true;
-
+    
     function runTest() {
-        if (!testRunner.hasAppBoundSession()) {
-            testFailed("Origin did not start with app-bound session.");
-            finishJSTest();
+        if (document.location.hash == "") {
+            // Load this test again with a random dummy value to avoid caching.
+            document.location.href = "http://127.0.0.1:8000/in-app-browser-privacy/app-bound-domain-gets-app-bound-session.html?dummyParam=" + Math.random() + "#step1";
         } else {
-            testPassed("Origin has app-bound session.");
-            finishJSTest();
+            if (!testRunner.hasAppBoundSession()) {
+                testFailed("Origin does not have app-bound session.");
+                finishJSTest();
+            } else {
+                testPassed("Origin has app-bound session.");
+                finishJSTest();
+            }
         }
     }

trunk/LayoutTests/http/tests/in-app-browser-privacy/non-app-bound-domain-does-not-get-app-bound-session.html

@@ -12 +12 @@
 
     function runTest() {
-        if (testRunner.hasAppBoundSession()) {
-            testFailed("Origin started with app-bound session.");
-            finishJSTest();
+        if (document.location.hash == "") {
+            // Load this test again with a random dummy value to avoid caching.
+            document.location.href = "http://127.0.0.1:8000/in-app-browser-privacy/non-app-bound-domain-does-not-get-app-bound-session.html?dummyParam=" + Math.random() + "#step1";
         } else {
-            testPassed("Origin has non-app-bound session.");
-            finishJSTest();
+            if (testRunner.hasAppBoundSession()) {
+                testFailed("Origin started with app-bound session.");
+                finishJSTest();
+            } else {
+                testPassed("Origin has non-app-bound session.");
+                finishJSTest();
+            }
         }
     }

trunk/LayoutTests/http/tests/in-app-browser-privacy/non-app-bound-iframe-under-app-bound-domain-is-app-bound.html

@@ -26 +26 @@
     function loadFrame() {
         let iframeElement = document.createElement("iframe");
-        iframeElement.src = "http://localhost:8000/in-app-browser-privacy/resources/non-app-bound-iframe.html";
+        iframeElement.src = "http://localhost:8000/in-app-browser-privacy/resources/non-app-bound-iframe.html?dummyParam" + Math.random();
         document.body.appendChild(iframeElement);
     }
     
     function runTest() {
-        if (!testRunner.hasAppBoundSession()) {
-            testFailed("Origin did not start with app-bound session.");
+        if (document.location.hash == "") {
+            // Load this test again with a random dummy value to avoid caching.
+            document.location.href = "http://127.0.0.1:8000/in-app-browser-privacy/non-app-bound-iframe-under-app-bound-domain-is-app-bound.html?dummyParam=" + Math.random() + "#step1";
         } else {
-            testPassed("Origin has app-bound session.");
-            
-            // Clear the app-bound session to make sure the iframe load creates
-            // a new one.
-            testRunner.clearAppBoundSession();
-            loadFrame();
+            if (!testRunner.hasAppBoundSession()) {
+                testFailed("Origin did not start with app-bound session.");
+                finishJSTest();
+            } else {
+                testPassed("Origin has app-bound session.");
+
+                // Clear the app-bound session to make sure the iframe load creates
+                // a new one.
+                testRunner.clearAppBoundSession();
+                loadFrame();
+            }
         }
     }