git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 83f9f9b)
fast/events/page-visibility-iframe-delete-test.html is flaky
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 24 Jun 2017 01:56:51 +0000 (01:56 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 24 Jun 2017 01:56:51 +0000 (01:56 +0000)
https://bugs.webkit.org/show_bug.cgi?id=173798

Reviewed by Simon Fraser.

Modernize the test and deflake it by not making it rely on a specific order
for the visibilitychange events. The event queues are per documents and there
is therefore no guarantee those events will fire in frame tree order.

* fast/events/page-visibility-iframe-delete-test-expected.txt:
* fast/events/page-visibility-iframe-delete-test.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@218779 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/events/page-visibility-iframe-delete-test-expected.txt patch | blob | history
LayoutTests/fast/events/page-visibility-iframe-delete-test.html patch | blob | history
LayoutTests/fast/events/resources/page-visibility-iframe-delete-test-frame.html patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 590cc67..53fb721 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2017-06-23  Chris Dumez  <cdumez@apple.com>
+
+        fast/events/page-visibility-iframe-delete-test.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=173798
+
+        Reviewed by Simon Fraser.
+
+        Modernize the test and deflake it by not making it rely on a specific order
+        for the visibilitychange events. The event queues are per documents and there
+        is therefore no guarantee those events will fire in frame tree order.
+
+        * fast/events/page-visibility-iframe-delete-test-expected.txt:
+        * fast/events/page-visibility-iframe-delete-test.html:
+
 2017-06-23  Youenn Fablet  <youenn@apple.com>
 
         Add a binary data channel webrtc test
 2017-06-23  Youenn Fablet  <youenn@apple.com>
 
         Add a binary data channel webrtc test
diff --git a/LayoutTests/fast/events/page-visibility-iframe-delete-test-expected.txt b/LayoutTests/fast/events/page-visibility-iframe-delete-test-expected.txt
index 618f0c9..a50d609 100644 (file)
--- a/LayoutTests/fast/events/page-visibility-iframe-delete-test-expected.txt
+++ b/LayoutTests/fast/events/page-visibility-iframe-delete-test-expected.txt
@@ -4,8 +4,8 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 Loaded all frames.
 
 
 Loaded all frames.
-Visibility of main document changed.
-Visibility of sub frame 2 changed.
+Received visibilitychange event
+Received visibilitychange event
 PASS successfullyParsed is true
 
 TEST COMPLETE
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/fast/events/page-visibility-iframe-delete-test.html b/LayoutTests/fast/events/page-visibility-iframe-delete-test.html
index e27ab87..edc2b7a 100644 (file)
--- a/LayoutTests/fast/events/page-visibility-iframe-delete-test.html
+++ b/LayoutTests/fast/events/page-visibility-iframe-delete-test.html
@@ -1,28 +1,14 @@
+<!DOCTYPE html>
 <html>
 <html>
-<body onload="startTest()">
-
-<script src="../../resources/js-test-pre.js"></script>
-
+<body>
+<script src="../../resources/js-test.js"></script>
 <script>
 <script>
-
 description("This test checks that the page visibility event propagation does not crash the browser when frames are added / deleted.");
 description("This test checks that the page visibility event propagation does not crash the browser when frames are added / deleted.");
+jsTestIsAsync = true;
 
 
-var jsTestIsAsync = true;
-
-var numVisibilityChanges = 0;
-var frame1, frame2, frame3, frame4, frame5, subframe1, subFrame2, subFrame3;
-
-var docsLoaded = 0;
-var mainPageVisibilityChangeDone = false;
-var frame2VisiblityChangeDone = false;
-var finishTestDone = false;
-
-function startTest() {
-    ++docsLoaded;
-    if (docsLoaded < 8) {
-      return;
-   }
+let visibilityChangeEventCount = 0;
 
 
+onload = function() {
     debug("Loaded all frames.");
 
     frame1 = document.getElementById("topFrame1");
     debug("Loaded all frames.");
 
     frame1 = document.getElementById("topFrame1");
@@ -32,81 +18,53 @@ function startTest() {
     subFrame1 = frame3.contentDocument.getElementById("subIframe1");
     subFrame2 = frame3.contentDocument.getElementById("subIframe2");
 
     subFrame1 = frame3.contentDocument.getElementById("subIframe1");
     subFrame2 = frame3.contentDocument.getElementById("subIframe2");
 
-    document.addEventListener(
-        "visibilitychange", onMainPageVisibilityChange, false);
-    frame2.contentDocument.addEventListener(
-        "visibilitychange", onFrame2VisibilityChange, false);
+    document.addEventListener("visibilitychange", onMainPageVisibilityChange);
+    frame2.contentDocument.addEventListener("visibilitychange", onFrame2VisibilityChange);
+
     // Change the visibility of the current page to invisible.
     // Change the visibility of the current page to invisible.
-    if (window.testRunner) {
-        numVisibilityChanges++;
+    if (window.testRunner)
         testRunner.setPageVisibility("hidden");
         testRunner.setPageVisibility("hidden");
-    }
 }
 
 }
 
-function finishTest() {
-    document.removeEventListener(
-        "visibilitychange", onMainPageVisibilityChange, false);
-    frame2.contentDocument.removeEventListener(
-        "visibilitychange", onFrame2VisibilityChange, false);
+function onMainPageVisibilityChange()
+{
+    ++visibilityChangeEventCount;
+    debug("Received visibilitychange event");
 
 
-    if (window.testRunner)
-        testRunner.resetPageVisibility();
-    finishJSTest();
-}
-
-function onMainPageVisibilityChange() {
-    if (mainPageVisibilityChangeDone && frame2VisiblityChangeDone) {
-        finishTest();
-    } else if (!mainPageVisibilityChangeDone) {
-        debug("Visibility of main document changed.");
-        // Delete frame 4.
-        document.body.removeChild(frame4);
+    // Delete frame 4.
+    frame4.remove();
 
         // Delete subframe 2.
 
         // Delete subframe 2.
-        frame3.contentDocument.body.removeChild(subFrame2);
-
-        // Add a new frame to top level.
-        frame5 = document.createElement("iframe");
-        frame5.src = '';
-        document.body.appendChild(frame5);
+    frame3.contentDocument.body.removeChild(subFrame2);
 
 
-        // Add a new frame to frame2.
-        subFrame3 = frame2.contentDocument.createElement("iframe");
-        subFrame3.src = '';
-        frame2.contentDocument.body.appendChild(subFrame3);
+    // Add a new frame to top level.
+    frame5 = document.createElement("iframe");
+    document.body.appendChild(frame5);
 
 
-        mainPageVisibilityChangeDone = true;
-    }
+    // Add a new frame to frame2.
+    subFrame3 = frame2.contentDocument.createElement("iframe");
+    frame2.contentDocument.body.appendChild(subFrame3);
 
 
-    if (mainPageVisibilityChangeDone && frame2VisiblityChangeDone) {
-        finishTest();
-    }
+    if (visibilityChangeEventCount == 2)
+        finishJSTest();
 }
 
 }
 
-function onFrame2VisibilityChange() {
-    if (mainPageVisibilityChangeDone && frame2VisiblityChangeDone) {
-        finishTest();
-    } else if (!frame2VisiblityChangeDone) {
-        debug("Visibility of sub frame 2 changed.");
+function onFrame2VisibilityChange()
+{
+    ++visibilityChangeEventCount;
+    debug("Received visibilitychange event");
 
 
-        // Delete frame 1.
-        document.body.removeChild(frame1);
+    // Delete frame 1.
+    frame1.remove();
 
 
-        frame2VisiblityChangeDone = true;
-    }
-
-    if (mainPageVisibilityChangeDone && frame2VisiblityChangeDone) {
-        finishTest();
-    }
+    if (visibilityChangeEventCount == 2)
+        finishJSTest();
 }
 
 </script>
 }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
-
-<iframe id="topFrame1" onload="startTest()" ></iframe>
-<iframe id="topFrame2" onload="startTest()" ></iframe>
-<iframe id="topFrame3" onload="startTest()" src="resources/page-visibility-iframe-delete-test-frame.html"></iframe>
-<iframe id="topFrame4" onload="startTest()" ></iframe>
+<iframe id="topFrame1"></iframe>
+<iframe id="topFrame2"></iframe>
+<iframe id="topFrame3" src="resources/page-visibility-iframe-delete-test-frame.html"></iframe>
+<iframe id="topFrame4"></iframe>
 </body>
 </html>
 </body>
 </html>
diff --git a/LayoutTests/fast/events/resources/page-visibility-iframe-delete-test-frame.html b/LayoutTests/fast/events/resources/page-visibility-iframe-delete-test-frame.html
index febb954..f52f419 100644 (file)
--- a/LayoutTests/fast/events/resources/page-visibility-iframe-delete-test-frame.html
+++ b/LayoutTests/fast/events/resources/page-visibility-iframe-delete-test-frame.html
@@ -1,6 +1,7 @@
+<!DOCTYPE html>
 <html>
 <html>
-<body onload="parent.startTest()">
-<iframe id="subIframe1" onload="parent.parent.startTest()"></iframe>
-<iframe id="subIframe2" onload="parent.parent.startTest()"></iframe>
+<body>
+<iframe id="subIframe1"></iframe>
+<iframe id="subIframe2"></iframe>
 </body>
 </html>
 </body>
 </html>
Mirror of the WebKit open source project from svn.webkit.org.