Changeset 223556 in webkit

Timestamp:

Oct 17, 2017 10:41:28 AM (7 years ago)

Author:

achristensen@apple.com

Message:

de-flakify http/tests/security/cross-frame-access-put.html
​https://bugs.webkit.org/show_bug.cgi?id=178371

Reviewed by Tim Horton.

In the iframe, the test was being run after 0ms. Sometimes, the whole iframe hadn't loaded yet,
so window.innerHeight and window.innerWidth were 0 instead of their intended values. This changes
the test to wait for the iframe to finish loading before running the test, then post a message to
the parent to tell it to finish running its test instead of just relying on setTimeout(..., 0) to
always work after the iframe had finished loading.

• http/tests/security/cross-frame-access-put-expected.txt:
• http/tests/security/cross-frame-access-put.html:
• http/tests/security/resources/cross-frame-iframe-for-put-test.html:
• platform/mac-wk2/TestExpectations:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/security/cross-frame-access-put-expected.txt (modified) (1 diff)
• http/tests/security/cross-frame-access-put.html (modified) (2 diffs)
• http/tests/security/resources/cross-frame-iframe-for-put-test.html (modified) (2 diffs)
• platform/mac-wk2/TestExpectations (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-10-17  Alex Christensen  <achristensen@webkit.org>
+
+        de-flakify http/tests/security/cross-frame-access-put.html
+        https://bugs.webkit.org/show_bug.cgi?id=178371
+
+        Reviewed by Tim Horton.
+
+        In the iframe, the test was being run after 0ms.  Sometimes, the whole iframe hadn't loaded yet,
+        so window.innerHeight and window.innerWidth were 0 instead of their intended values.  This changes
+        the test to wait for the iframe to finish loading before running the test, then post a message to
+        the parent to tell it to finish running its test instead of just relying on setTimeout(..., 0) to
+        always work after the iframe had finished loading.
+
+        * http/tests/security/cross-frame-access-put-expected.txt:
+        * http/tests/security/cross-frame-access-put.html:
+        * http/tests/security/resources/cross-frame-iframe-for-put-test.html:
+        * platform/mac-wk2/TestExpectations:
+
 2017-10-17  Alex Christensen  <achristensen@webkit.org>
 

trunk/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt

@@ -186 +186 @@
 ALERT: PASS: window.showModalDialog matched the expected value.
 ALERT: PASS: window.stop should be 'function stop() {    [native code]}' and is.
+ALERT: continue test in parent frame
 This test checks cross-frame access security of window attribute setters (rdar://problem/5326791).
 

trunk/LayoutTests/http/tests/security/cross-frame-access-put.html

@@ -20 +20 @@
 window.targetWindow = window.frames[0];
 
+window.addEventListener("message", test, false);
+
 window.onload = function()
 {
@@ -26 +28 @@
         testRunner.waitUntilDone();
     }
-
-    // There is code in subframe that runs some tests, and that is scheduled on a zero delay
-    // timer when the subframe loads. The timer that we schedule here will run after the one
-    // in subframe, making the order of tests predictable.
-    setTimeout(test, 0);
-}
-
-function test() {
+}
+
+function test(message) {
+    alert(message.data);
     // FIXME: This test should use fast/window/resources/window-properties.js instead of a custom list.
     // Constructors

trunk/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-put-test.html

@@ -242 +242 @@
         // The test runs on a timer and not in a load event handler because we want both
         // window.onload and window.event to be undefined.
-        setTimeout(function() {
+        function runTest() {
             // Constructors
             shouldBe("window.Attr", "AttrOld");
@@ -452 +452 @@
             shouldBe("window.showModalDialog", "showModalDialogOld", true);
             shouldBe("window.stop", "stopOld");
-        }, 0);
+            window.parent.postMessage("continue test in parent frame", "*")
+        };
+        function checkAndRunTest() {
+            if (window.innerHeight == 150)
+                runTest();
+            else
+                setTimeout(checkAndRunTest, 10);
+        }
+        checkAndRunTest();
     </script>
 </body>

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -337 +337 @@
 webkit.org/b/150942 animations/multiple-backgrounds.html [ Pass ImageOnlyFailure ]
 
-webkit.org/b/151053 http/tests/security/cross-frame-access-put.html [ Pass Failure ]
-
 webkit.org/b/151326 [ Yosemite+ ] webarchive/loading/missing-data.html [ Pass Crash ]