Modified: trunk/LayoutTests/ChangeLog (213202 => 213203)
--- trunk/LayoutTests/ChangeLog 2017-03-01 02:54:18 UTC (rev 213202)
+++ trunk/LayoutTests/ChangeLog 2017-03-01 03:04:24 UTC (rev 213203)
@@ -1,3 +1,18 @@
+2017-02-28 Antoine Quint <grao...@apple.com>
+
+ [mac-wk1] LayoutTest media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html is a flaky timeout
+ https://bugs.webkit.org/show_bug.cgi?id=167589
+ <rdar://problem/30772101>
+
+ Reviewed by Jon Lee.
+
+ Making this test more robust by making width assertions timer-based so that we lessen the assumptions
+ made about when the values ought to be reached.
+
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html:
+ * platform/mac-wk1/TestExpectations:
+
2017-02-28 Javier Fernandez <jfernan...@igalia.com>
[GTK] Unreviewed test gardening
Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt (213202 => 213203)
--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt 2017-03-01 02:54:18 UTC (rev 213202)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt 2017-03-01 03:04:24 UTC (rev 213203)
@@ -2,17 +2,16 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS buttons.some(button => button.element.style.width == '') became false
-PASS centerContainerBounds.left is 311
-PASS centerContainerBounds.top is 500
-PASS centerContainerBounds.width is 178
-PASS centerContainerBounds.height is 44
+PASS centerContainer.element.getBoundingClientRect().width became 178
+PASS centerContainer.element.getBoundingClientRect().left is 311
+PASS centerContainer.element.getBoundingClientRect().top is 500
+PASS centerContainer.element.getBoundingClientRect().height is 44
-PASS rightContainerBounds.left is within 0.5 of 496
-PASS rightContainerBounds.top is 500
-PASS rightContainerBounds.width is within 0.5 of 138
-PASS rightContainerBounds.height is 44
+PASS Math.floor(rightContainer.element.getBoundingClientRect().width) became 138
+PASS rightContainer.element.getBoundingClientRect().left is within 0.5 of 496
+PASS rightContainer.element.getBoundingClientRect().top is 500
+PASS rightContainer.element.getBoundingClientRect().height is 44
PASS successfullyParsed is true
Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html (213202 => 213203)
--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html 2017-03-01 02:54:18 UTC (rev 213202)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html 2017-03-01 03:04:24 UTC (rev 213203)
@@ -34,27 +34,19 @@
document.getElementById("container").appendChild(mediaControls.element);
-let centerContainerBounds, rightContainerBounds;
-shouldBecomeEqual("buttons.some(button => button.element.style.width == '')", "false", () => {
- // All buttons have been loaded, we wait for the next tick to ensure
- // that their CSS properties have also been committed.
- window.requestAnimationFrame(() => {
- centerContainerBounds = centerContainer.element.getBoundingClientRect();
+debug("");
+shouldBecomeEqual("centerContainer.element.getBoundingClientRect().width", "178", () => {
+ shouldBe("centerContainer.element.getBoundingClientRect().left", "311");
+ shouldBe("centerContainer.element.getBoundingClientRect().top", "500");
+ shouldBe("centerContainer.element.getBoundingClientRect().height", "44");
- debug("");
- shouldBe("centerContainerBounds.left", "311");
- shouldBe("centerContainerBounds.top", "500");
- shouldBe("centerContainerBounds.width", "178");
- shouldBe("centerContainerBounds.height", "44");
+ debug("");
+ shouldBecomeEqual("Math.floor(rightContainer.element.getBoundingClientRect().width)", "138", () => {
+ shouldBeCloseTo("rightContainer.element.getBoundingClientRect().left", 496, 0.5);
+ shouldBe("rightContainer.element.getBoundingClientRect().top", "500");
+ shouldBe("rightContainer.element.getBoundingClientRect().height", "44");
debug("");
- rightContainerBounds = rightContainer.element.getBoundingClientRect();
- shouldBeCloseTo("rightContainerBounds.left", 496, 0.5);
- shouldBe("rightContainerBounds.top", "500");
- shouldBeCloseTo("rightContainerBounds.width", 138, 0.5);
- shouldBe("rightContainerBounds.height", "44");
-
- debug("");
mediaControls.element.remove();
finishJSTest();
});
Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (213202 => 213203)
--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2017-03-01 02:54:18 UTC (rev 213202)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2017-03-01 03:04:24 UTC (rev 213203)
@@ -321,6 +321,5 @@
webkit.org/b/167857 pageoverlay/overlay-remove-reinsert-view.html [ Skip ]
webkit.org/b/168409 media/modern-media-controls/airplay-button/airplay-button.html [ Pass Timeout ]
-webkit.org/b/167589 media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html [ Pass Timeout ]
webkit.org/b/168378 media/modern-media-controls/media-controller/media-controller-resize.html [ Pass Failure ]
webkit.org/b/168476 media/modern-media-controls/tracks-button/tracks-button.html [ Pass Timeout ]
