Title: [217939] trunk/LayoutTests
Revision
217939
Author
[email protected]
Date
2017-06-08 11:53:53 -0700 (Thu, 08 Jun 2017)

Log Message

Layout Test media/modern-media-controls/button/button-icon-name.html is a flaky failure
https://bugs.webkit.org/show_bug.cgi?id=173099

Reviewed by Dean Jackson.

Rewrite the test to use asynchronous assertions, the number of frames running is immaterial to this test.

* media/modern-media-controls/button/button-icon-name-expected.txt:
* media/modern-media-controls/button/button-icon-name.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (217938 => 217939)


--- trunk/LayoutTests/ChangeLog	2017-06-08 18:27:59 UTC (rev 217938)
+++ trunk/LayoutTests/ChangeLog	2017-06-08 18:53:53 UTC (rev 217939)
@@ -1,3 +1,15 @@
+2017-06-08  Antoine Quint  <[email protected]>
+
+        Layout Test media/modern-media-controls/button/button-icon-name.html is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=173099
+
+        Reviewed by Dean Jackson.
+
+        Rewrite the test to use asynchronous assertions, the number of frames running is immaterial to this test.
+
+        * media/modern-media-controls/button/button-icon-name-expected.txt:
+        * media/modern-media-controls/button/button-icon-name.html:
+
 2017-06-08  Tim Horton  <[email protected]>
 
         Add a borderless mode to <attachment>, and make it respect its layout size

Modified: trunk/LayoutTests/media/modern-media-controls/button/button-icon-name-expected.txt (217938 => 217939)


--- trunk/LayoutTests/media/modern-media-controls/button/button-icon-name-expected.txt	2017-06-08 18:27:59 UTC (rev 217938)
+++ trunk/LayoutTests/media/modern-media-controls/button/button-icon-name-expected.txt	2017-06-08 18:53:53 UTC (rev 217939)
@@ -12,7 +12,7 @@
 PASS button.iconName is ""
 
 Setting macOS inline layout traits and setting play icon
-PASS button.image.element.style.webkitMaskImage.includes("macOS/Pause.svg") is true
+PASS button.image.element.style.webkitMaskImage.includes("macOS/Pause.svg") became true
 PASS button.element.style.width is "11px"
 PASS button.element.style.height is "13px"
 PASS button.image.element.style.width is "11px"
@@ -20,7 +20,7 @@
 PASS button.element.getAttribute('aria-label') is "Pause"
 
 Setting start icon
-PASS button.image.element.style.webkitMaskImage.includes("macOS/Rewind.svg") is true
+PASS button.image.element.style.webkitMaskImage.includes("macOS/Rewind.svg") became true
 PASS button.element.style.width is "24px"
 PASS button.element.style.height is "16px"
 PASS button.image.element.style.width is "24px"

Modified: trunk/LayoutTests/media/modern-media-controls/button/button-icon-name.html (217938 => 217939)


--- trunk/LayoutTests/media/modern-media-controls/button/button-icon-name.html	2017-06-08 18:27:59 UTC (rev 217938)
+++ trunk/LayoutTests/media/modern-media-controls/button/button-icon-name.html	2017-06-08 18:53:53 UTC (rev 217939)
@@ -26,24 +26,17 @@
 layoutDelegate.layoutTraits = LayoutTraits.macOS;
 button.iconName = Icons.Pause;
 
-let numberOfFrames = 0;
+shouldBecomeEqual('button.image.element.style.webkitMaskImage.includes("macOS/Pause.svg")', "true", () => {
+    shouldBeEqualToString("button.element.style.width", "11px");
+    shouldBeEqualToString("button.element.style.height", "13px");
+    shouldBeEqualToString("button.image.element.style.width", "11px");
+    shouldBeEqualToString("button.image.element.style.height", "13px");
+    shouldBeEqualToString("button.element.getAttribute('aria-label')", `${Icons.Pause.label}`);
+    debug("");
+    debug("Setting start icon");
+    button.iconName = Icons.Rewind;
 
-scheduler.frameDidFire = function()
-{
-    numberOfFrames++;
-
-    if (numberOfFrames === 1) {
-        shouldBeTrue('button.image.element.style.webkitMaskImage.includes("macOS/Pause.svg")');
-        shouldBeEqualToString("button.element.style.width", "11px");
-        shouldBeEqualToString("button.element.style.height", "13px");
-        shouldBeEqualToString("button.image.element.style.width", "11px");
-        shouldBeEqualToString("button.image.element.style.height", "13px");
-        shouldBeEqualToString("button.element.getAttribute('aria-label')", `${Icons.Pause.label}`);
-        debug("");
-        debug("Setting start icon");
-        button.iconName = Icons.Rewind;
-    } else if (numberOfFrames === 2) {
-        shouldBeTrue('button.image.element.style.webkitMaskImage.includes("macOS/Rewind.svg")');
+    shouldBecomeEqual('button.image.element.style.webkitMaskImage.includes("macOS/Rewind.svg")', "true", () => {
         shouldBeEqualToString("button.element.style.width", "24px");
         shouldBeEqualToString("button.element.style.height", "16px");
         shouldBeEqualToString("button.image.element.style.width", "24px");
@@ -50,9 +43,9 @@
         shouldBeEqualToString("button.image.element.style.height", "16px");
         shouldBeEqualToString("button.element.getAttribute('aria-label')", `${Icons.Rewind.label}`);
 
-        finishMediaControlsTest();
-    } 
-};
+        finishJSTest();
+    });
+});
 
 </script>
 <script src=""
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to