Title: [156362] trunk/LayoutTests
Revision
156362
Author
[email protected]
Date
2013-09-24 15:09:19 -0700 (Tue, 24 Sep 2013)

Log Message

Flaky Test: fast/history/history-subframe-with-name.html
https://bugs.webkit.org/show_bug.cgi?id=51039

Reviewed by Anders Carlsson.

Speculative fix, I could not reproduce locally.

* fast/history/resources/history-subframe-with-name-container.html: Added a check
that onunload trick worked. 

* fast/history/resources/history-subframe-with-name-2.html: Starting the navigation
used to race with loading another iframe in the parent. Wait until the parent loads.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (156361 => 156362)


--- trunk/LayoutTests/ChangeLog	2013-09-24 21:51:00 UTC (rev 156361)
+++ trunk/LayoutTests/ChangeLog	2013-09-24 22:09:19 UTC (rev 156362)
@@ -1,3 +1,18 @@
+2013-09-24  Alexey Proskuryakov  <[email protected]>
+
+        Flaky Test: fast/history/history-subframe-with-name.html
+        https://bugs.webkit.org/show_bug.cgi?id=51039
+
+        Reviewed by Anders Carlsson.
+
+        Speculative fix, I could not reproduce locally.
+
+        * fast/history/resources/history-subframe-with-name-container.html: Added a check
+        that onunload trick worked. 
+
+        * fast/history/resources/history-subframe-with-name-2.html: Starting the navigation
+        used to race with loading another iframe in the parent. Wait until the parent loads.
+
 2013-09-24  Dean Jackson  <[email protected]>
 
         webgl/conformance/extensions/oes-element-index-uint.html failing after r156351 or 156352

Modified: trunk/LayoutTests/fast/history/resources/history-subframe-with-name-2.html (156361 => 156362)


--- trunk/LayoutTests/fast/history/resources/history-subframe-with-name-2.html	2013-09-24 21:51:00 UTC (rev 156361)
+++ trunk/LayoutTests/fast/history/resources/history-subframe-with-name-2.html	2013-09-24 22:09:19 UTC (rev 156362)
@@ -2,6 +2,11 @@
 <script> 
   function runTest()
   {
+      // The parent has two frames. Do not run the test until both finished loading.
+      if (parent.document.readyState != "complete") {
+          setTimeout(runTest, 0);
+          return;
+      }
       parent.opener.onFrameLoaded(2);
       // Make sure we generate a history entry
       setTimeout(function() {location.href = '';}, 0);

Modified: trunk/LayoutTests/fast/history/resources/history-subframe-with-name-container.html (156361 => 156362)


--- trunk/LayoutTests/fast/history/resources/history-subframe-with-name-container.html	2013-09-24 21:51:00 UTC (rev 156361)
+++ trunk/LayoutTests/fast/history/resources/history-subframe-with-name-container.html	2013-09-24 22:09:19 UTC (rev 156362)
@@ -1,6 +1,7 @@
 <script>
 // Disable the page cache when running inside of Safari
-_onunload_ = function() {};
+_onunload_ = function() { }
+_onpageshow_ = function() { if (event.persisted) alert("FAIL: Could not disable page cache"); }
 </script>
 <iframe src=""
 <iframe src="" that changes its name"></iframe>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to