Avoid flakiness in history{-iframe}.sub.html.

vinhill · moz-wptsync-bot · commit 24b49df40cd9 · 2026-05-06T00:46:10.000+01:00
Differential Revision: https://phabricator.services.mozilla.com/D297627 bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=2026147 gecko-commit: 91d0458eb329d0914df3eec3a325664b3fd1831c gecko-commit-git: 329705a5c23d176fd84ebc9e8c31ca8d028f2881 gecko-reviewers: dom-core, smaug
diff --git a/content-security-policy/inheritance/history-iframe.sub.html b/content-security-policy/inheritance/history-iframe.sub.html
@@ -52,7 +52,8 @@
     await t.step_wait(
       condition = () => {
         try {
-          return iframe.contentWindow.location.href == "about:blank";
+          return iframe.contentWindow.location.href == "about:blank" &&
+                 iframe.contentDocument.readyState == "complete";
         } catch {}
         return false;
       },
diff --git a/content-security-policy/inheritance/history.sub.html b/content-security-policy/inheritance/history.sub.html
@@ -148,27 +148,29 @@
 
       // Navigate to the local scheme document. We need to wait for the
       // navigation to succeed.
-      let wait = () => t.step_wait(
+      let wait = (msg) => t.step_wait(
         condition = () => {
           try {
-            return popup.location.href == testCase.url;
+            return popup.location.href == testCase.url &&
+                   popup.document.readyState == "complete";
           } catch {}
           return false;
         },
-        description = "Wait for the popup to navigate.",
+        description = "Wait for the popup to navigate: " + msg,
         timeout=3000,
         interval=50);
 
       let message = message_from(testCase.token);
       popup.location = testCase.url;
-      await wait();
+      await wait("to test url");
       if (testCase.add_img_function) {
         testCase.add_img_function(popup);
       }
 
       // Check that the local scheme document inherits CSP from the initiator.
       assert_equals(await message, "img blocked",
                     "Image should be blocked by CSP inherited from navigation initiator.");
+      assert_equals(popup.history.length, 2, "History entry for test url added");
 
       const token_2 = token();
       let loaded_2 = message_from(token_2, "ready");
@@ -181,7 +183,10 @@
                     "Could not navigate popup.");
 
       // We need to wait for the history navigation to be performed.
-      await wait();
+      await Promise.race([
+        message_from(token_1).then(() => assert_unreached("Navigated back too far")),
+        wait("history.back() to test url")
+      ])
 
       // Check that the "about:blank" document reloaded from history has the
       // original CSPs.
diff --git a/content-security-policy/inheritance/support/postmessage-opener.html b/content-security-policy/inheritance/support/postmessage-opener.html
@@ -1,4 +1,6 @@
 <script>
+window.onload = () => {
   const params = new URLSearchParams(window.location.search);
   opener.postMessage({msg: "ready", token: params.get("token")}, "*");
+}
 </script>
diff --git a/content-security-policy/inheritance/support/postmessage-top.html b/content-security-policy/inheritance/support/postmessage-top.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
 <script>
+window.onload = () => {
   const params = new URLSearchParams(window.location.search);
   top.postMessage({msg: "ready", token: params.get("token")}, "*");
+}
 </script>
