fast/fixed-layout/fixed-layout.html is flaky

https://bugs.webkit.org/show_bug.cgi?id=143379

Reviewed by Simon Fraser.

* TestExpectations:
Un-flakify the fixed layout test.

* fast/css-grid-layout/flex-content-sized-columns-resize-expected.html:
Remove a mistaken line in the original test; this function doesn't exist in WebKit
and was presumably ported directly from the Blink test (and then never noticed because
JS exceptions thrown in -expected files go nowhere).

* fast/fixed-layout/fixed-layout.html:
Make the fixed layout test less racy by waiting for the resize event (which can be
very asynchronous). Also, force a layout before resizing to ensure that we
always do get a resize event.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3f6ea7a0bcdf4538e20cc1ee0d1fa445a3eb9757..414c77ae5085d839c1fd599cab86cf6de4430a68 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,23 @@
+2015-04-03  Tim Horton  <timothy_horton@apple.com>
+
+        fast/fixed-layout/fixed-layout.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=143379
+
+        Reviewed by Simon Fraser.
+
+        * TestExpectations:
+        Un-flakify the fixed layout test.
+
+        * fast/css-grid-layout/flex-content-sized-columns-resize-expected.html:
+        Remove a mistaken line in the original test; this function doesn't exist in WebKit
+        and was presumably ported directly from the Blink test (and then never noticed because
+        JS exceptions thrown in -expected files go nowhere).
+
+        * fast/fixed-layout/fixed-layout.html:
+        Make the fixed layout test less racy by waiting for the resize event (which can be
+        very asynchronous). Also, force a layout before resizing to ensure that we
+        always do get a resize event.
+
 2015-04-03  Chris Fleizach  <cfleizach@apple.com>
 
         AX: Toggling check box state not speaking using plain space, not VO space.

diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
index f0b951cf8e6ee71ce8279e2c7acedc0a6689079f..9ce73a4e589da3a881c498a38e9bf89da6eb50f9 100644 (file)
--- a/LayoutTests/TestExpectations
+++ b/LayoutTests/TestExpectations
@@ -515,5 +515,3 @@ webkit.org/b/142937 ietestcenter/Javascript/15.2.3.13-1.html [ Failure ]
 webkit.org/b/142937 ietestcenter/Javascript/15.2.3.14-1-1.html [ Failure ]
 webkit.org/b/142937 ietestcenter/Javascript/15.2.3.14-1-2.html [ Failure ]
 webkit.org/b/142937 ietestcenter/Javascript/15.2.3.14-1-3.html [ Failure ]
-
-webkit.org/b/143379 fast/fixed-layout/fixed-layout.html [ Pass Failure ]

diff --git a/LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize-expected.html b/LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize-expected.html
index f9117612c402a8a6a139036e7e4b0486171acc74..7372d8114d5e3d41ce51ab224d77fe2d069f663c 100644 (file)
--- a/LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize-expected.html
+++ b/LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize-expected.html
@@ -20,7 +20,6 @@
     <script>
         function runTest() {
             if (window.testRunner) {
-                testRunner.useUnfortunateSynchronousResizeMode();
                 window.resizeTo(600, 600);
             }
         }

diff --git a/LayoutTests/fast/fixed-layout/fixed-layout.html b/LayoutTests/fast/fixed-layout/fixed-layout.html
index 37a0414af396f0f6460fe2723b09c5ddd4f1d3ca..d0f3eb5c6cf84565aeb1170cda2fd4dfc406ee5f 100644 (file)
--- a/LayoutTests/fast/fixed-layout/fixed-layout.html
+++ b/LayoutTests/fast/fixed-layout/fixed-layout.html
@@ -6,16 +6,19 @@ window.onload = function () {
         return;
     }
 
-    testRunner.waitUntilDone();
+    // Ensure layout is up to date here so that we get a resize event instead of just using
+    // 200x200 as the initial size, in WebKit1 (causing the test to hang).
+    document.body.offsetTop;
 
+    testRunner.waitUntilDone();
     window.resizeTo(200, 200);
+}
 
+window.onresize = function () {
     internals.setUseFixedLayout(true);
     internals.setFixedLayoutSize(400, 400);
 
-    setTimeout(function () {
-        testRunner.notifyDone();
-    }, 0);
+    testRunner.notifyDone();
 }
 </script>
 </head>