Title: [213245] trunk/LayoutTests
Revision
213245
Author
commit-qu...@webkit.org
Date
2017-03-01 14:39:31 -0800 (Wed, 01 Mar 2017)

Log Message

LayoutTest media/modern-media-controls/play-pause-button/play-pause-button.html is a flaky timeout
https://bugs.webkit.org/show_bug.cgi?id=167447
<rdar://problem/30790539>

Patch by Antoine Quint <grao...@apple.com> on 2017-03-01
Reviewed by Dean Jackson.

Use a chain of asynchronous assertions to make the test more robust.

* media/modern-media-controls/play-pause-button/play-pause-button-expected.txt:
* media/modern-media-controls/play-pause-button/play-pause-button.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (213244 => 213245)


--- trunk/LayoutTests/ChangeLog	2017-03-01 22:36:32 UTC (rev 213244)
+++ trunk/LayoutTests/ChangeLog	2017-03-01 22:39:31 UTC (rev 213245)
@@ -1,5 +1,18 @@
 2017-03-01  Antoine Quint  <grao...@apple.com>
 
+        LayoutTest media/modern-media-controls/play-pause-button/play-pause-button.html is a flaky timeout
+        https://bugs.webkit.org/show_bug.cgi?id=167447
+        <rdar://problem/30790539>
+
+        Reviewed by Dean Jackson.
+
+        Use a chain of asynchronous assertions to make the test more robust.
+
+        * media/modern-media-controls/play-pause-button/play-pause-button-expected.txt:
+        * media/modern-media-controls/play-pause-button/play-pause-button.html:
+
+2017-03-01  Antoine Quint  <grao...@apple.com>
+
         [mac-wk1 debug] LayoutTest media/modern-media-controls/tracks-panel/tracks-panel-hide-click-outside.html is a flaky timeout
         https://bugs.webkit.org/show_bug.cgi?id=165290
         <rdar://problem/30787749>

Modified: trunk/LayoutTests/media/modern-media-controls/play-pause-button/play-pause-button-expected.txt (213244 => 213245)


--- trunk/LayoutTests/media/modern-media-controls/play-pause-button/play-pause-button-expected.txt	2017-03-01 22:36:32 UTC (rev 213244)
+++ trunk/LayoutTests/media/modern-media-controls/play-pause-button/play-pause-button-expected.txt	2017-03-01 22:39:31 UTC (rev 213245)
@@ -10,12 +10,13 @@
 PASS playButton.playing is false
 PASS pauseButton.playing is true
 PASS pauseButton.iconName is "pause"
-PASS playButton.element.style.webkitMaskImage.includes("macOS/play@") is true
-PASS pauseButton.element.style.webkitMaskImage.includes("macOS/pause@") is true
-PASS iOSPlayButton.element.style.webkitMaskImage.includes("iOS/play@") is true
-PASS iOSPauseButton.element.style.webkitMaskImage.includes("iOS/pause@") is true
-PASS fullscreenPlayButton.element.style.webkitMaskImage.includes("macOS/play-fullscreen@") is true
-PASS fullscreenPauseButton.element.style.webkitMaskImage.includes("macOS/pause-fullscreen@") is true
+PASS playButton.element.style.webkitMaskImage.includes("macOS/play@") became true
+PASS pauseButton.element.style.webkitMaskImage.includes("macOS/pause@") became true
+PASS iOSPlayButton.element.style.webkitMaskImage.includes("iOS/play@") became true
+PASS iOSPauseButton.element.style.webkitMaskImage.includes("iOS/pause@") became true
+PASS fullscreenPlayButton.element.style.webkitMaskImage.includes("macOS/play-fullscreen@") became true
+PASS fullscreenPauseButton.element.style.webkitMaskImage.includes("macOS/pause-fullscreen@") became true
+
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/media/modern-media-controls/play-pause-button/play-pause-button.html (213244 => 213245)


--- trunk/LayoutTests/media/modern-media-controls/play-pause-button/play-pause-button.html	2017-03-01 22:36:32 UTC (rev 213244)
+++ trunk/LayoutTests/media/modern-media-controls/play-pause-button/play-pause-button.html	2017-03-01 22:39:31 UTC (rev 213245)
@@ -30,20 +30,22 @@
 const iOSPauseButton = new PlayPauseButton({ layoutTraits: LayoutTraits.iOS });
 iOSPauseButton.playing = true;
 
-scheduler.frameDidFire = function()
-{
-    if ([playButton, pauseButton, iOSPlayButton, iOSPauseButton, fullscreenPlayButton, fullscreenPauseButton].some(button => button.width == 0))
-        return;
+shouldBecomeEqual('playButton.element.style.webkitMaskImage.includes("macOS/play@")', "true", () => {
+    shouldBecomeEqual('pauseButton.element.style.webkitMaskImage.includes("macOS/pause@")', "true", () => {
+        shouldBecomeEqual('iOSPlayButton.element.style.webkitMaskImage.includes("iOS/play@")', "true", () => {
+            shouldBecomeEqual('iOSPauseButton.element.style.webkitMaskImage.includes("iOS/pause@")', "true", () => {
+                shouldBecomeEqual('fullscreenPlayButton.element.style.webkitMaskImage.includes("macOS/play-fullscreen@")', "true", () => {
+                    shouldBecomeEqual('fullscreenPauseButton.element.style.webkitMaskImage.includes("macOS/pause-fullscreen@")', "true", () => {
+                        debug("");
+                        finishJSTest();
+                    });
+                });
+            });
+        });
+        
+    });
+});
 
-    shouldBeTrue('playButton.element.style.webkitMaskImage.includes("macOS/play@")');
-    shouldBeTrue('pauseButton.element.style.webkitMaskImage.includes("macOS/pause@")');
-    shouldBeTrue('iOSPlayButton.element.style.webkitMaskImage.includes("iOS/play@")');
-    shouldBeTrue('iOSPauseButton.element.style.webkitMaskImage.includes("iOS/pause@")');
-    shouldBeTrue('fullscreenPlayButton.element.style.webkitMaskImage.includes("macOS/play-fullscreen@")');
-    shouldBeTrue('fullscreenPauseButton.element.style.webkitMaskImage.includes("macOS/pause-fullscreen@")');
-    finishMediaControlsTest();
-};
-
 </script>
 <script src=""
 </body>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to