Bug 1675318 - Part 12: Split up the remaining tests in test_sessionhistory.html, r=peterv

annygakh · annygakh · commit bb8b7636151c · 2020-11-16T17:49:21.000Z
Differential Revision: https://phabricator.services.mozilla.com/D96875
diff --git a/docshell/test/navigation/file_static_and_dynamic_1.html b/docshell/test/navigation/file_static_and_dynamic_1.html
@@ -17,8 +17,7 @@
         var staticFrame = document.getElementById("staticframe");
         opener.ok(String(staticFrame.contentWindow.location).includes(staticFrame.src),
                   "Wrong document loaded!");
-        opener.nextTest();
-        window.close();
+        opener.finishTest();
       }
     }
     </script>
diff --git a/docshell/test/navigation/mochitest.ini b/docshell/test/navigation/mochitest.ini
@@ -91,7 +91,7 @@ skip-if =
 [test_performance_navigation.html]
 skip-if = fission # bug 1666602
 [test_sessionhistory.html]
-skip-if = toolkit == 'android' || fission # RANDOM on android
+skip-if = verify && (os == 'mac') && debug && webrender # Hit MOZ_CRASH(Shutdown too long, probably frozen, causing a crash.) bug 1677545
 [test_dynamic_frame_forward_back.html]
 [test_sessionhistory_document_write.html]
 [test_session_history_entry_cleanup.html]
@@ -107,6 +107,8 @@ skip-if = fission
 skip-if = toolkit == 'android' || fission # It relies on the bfcache
 [test_bug1379762.html]
 skip-if = fission # It relies on the bfcache
+[test_static_and_dynamic.html]
+skip-if = true # This was disabled for a few years now anyway, bug 1677544
 [test_sibling-matching-parent.html]
 [test_sibling-off-domain.html]
 [test_triggeringprincipal_frame_nav.html]
diff --git a/docshell/test/navigation/test_sessionhistory.html b/docshell/test/navigation/test_sessionhistory.html
@@ -4,31 +4,26 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
-  <title>Test for Bug </title>
+  <title>Test for Bug 462076</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body onload="nextTest()">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=">Mozilla Bug </a>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=462076">Mozilla Bug 462076</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 
 </div>
 <pre id="test">
   <script type="application/javascript">
-
-    /** Test for Bug  **/
-
     var testFiles =
       [ "file_bug462076_1.html",         // Dynamic frames before onload
         "file_bug462076_2.html",         // Dynamic frames when handling onload
         "file_bug462076_3.html",         // Dynamic frames after onload
-        // "file_static_and_dynamic_1.html",// Static and dynamic frames and forward-back
       ];
     var testCount = 0; // Used by the test files.
 
     SimpleTest.waitForExplicitFinish();
-    SimpleTest.requestFlakyTimeout("untriaged");
 
     var testWindow;
     function nextTest_() {
diff --git a/docshell/test/navigation/test_static_and_dynamic.html b/docshell/test/navigation/test_static_and_dynamic.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=
+-->
+<head>
+  <title>Test for static and dynamic frames and forward-back </title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="runTest()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=">Mozilla Bug </a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+    var testCount = 0; // Used by the test files.
+
+    SimpleTest.waitForExplicitFinish();
+
+    var testWindow;
+    function runTest() {
+      testWindow = window.open("file_static_and_dynamic_1.html", "", "width=360,height=480");
+      testWindow.onunload = function() { }; // to prevent bfcache
+    }
+
+    function finishTest() {
+      testWindow.close();
+      SimpleTest.finish();
+    }
+  </script>
+</pre>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,7 @@`
`17`	`17`	`var staticFrame = document.getElementById("staticframe");`
`18`	`18`	`opener.ok(String(staticFrame.contentWindow.location).includes(staticFrame.src),`
`19`	`19`	`"Wrong document loaded!");`
`20`		`- opener.nextTest();`
`21`		`- window.close();`
	`20`	`+ opener.finishTest();`
`22`	`21`	`}`
`23`	`22`	`}`
`24`	`23`	`</script>`