Changeset 206612 in webkit

Timestamp:

Sep 29, 2016, 2:04:34 PM (9 years ago)

Author:

adachan@apple.com

Message:

Fix flaky test media/click-placeholder-not-pausing.html
​https://bugs.webkit.org/show_bug.cgi?id=162661

Reviewed by Eric Carlson.

This test became flaky after r201474 when we started to delay showing
the inline placeholder until we are sure the video layer has been moved
into the video fullscreen layer. This means we can't guarantee that the
placeholder is visible right away after the video's presentation mode
changes to "picture-in-picture".

To fix this, wait for the placeholder to become visible before clicking it.

• media/click-placeholder-not-pausing.html:
• platform/mac-wk2/TestExpectations:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• media/click-placeholder-not-pausing.html (modified) (2 diffs)
• platform/mac-wk2/TestExpectations (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-28  Ada Chan  <adachan@apple.com>
+
+        Fix flaky test media/click-placeholder-not-pausing.html
+        https://bugs.webkit.org/show_bug.cgi?id=162661
+
+        Reviewed by Eric Carlson.
+
+        This test became flaky after r201474 when we started to delay showing
+        the inline placeholder until we are sure the video layer has been moved
+        into the video fullscreen layer. This means we can't guarantee that the
+        placeholder is visible right away after the video's presentation mode
+        changes to "picture-in-picture".
+
+        To fix this, wait for the placeholder to become visible before clicking it.
+
+        * media/click-placeholder-not-pausing.html:
+        * platform/mac-wk2/TestExpectations:
+
 2016-09-29  Commit Queue  <commit-queue@webkit.org>
 

trunk/LayoutTests/media/click-placeholder-not-pausing.html

@@ -8 +8 @@
         var mediaElement;
         var placeholder;
+        var maxAttemptsToTestPlaceholderVisibility = 10;
+        var attemptsToTestPlaceholderVisibility = 0;
+
 
         if (window.internals)
@@ -39 +42 @@
             testExpected("mediaElement.webkitPresentationMode", "picture-in-picture");
 
+            pollPIPPlaceholderVisibilityChange();
+        }
+
+        function pollPIPPlaceholderVisibilityChange()
+        {
             placeholder = mediaControlsElement(internals.shadowRoot(mediaElement), '-webkit-media-controls-wireless-playback-status');
+
+            if (placeholder.classList.contains('hidden')) {
+                if (attemptsToTestPlaceholderVisibility > maxAttemptsToTestPlaceholderVisibility) {
+                    failTest("Inline placeholder did not become visible after video enters picture-in-picture.");
+                    endTest();
+                    return;
+                }
+
+                // Use 33 to match PlaceholderPollingDelay in mediaControlsApple.js.
+                setTimeout(pollPIPPlaceholderVisibilityChange, 33);
+                attemptsToTestPlaceholderVisibility++;
+                return;
+            }
+
             testExpected("placeholder.classList.contains('hidden')", false);
 

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -473 +473 @@
 
 # rdar://problem/26885345
-[ Release Sierra+ ] media/click-placeholder-not-pausing.html [ Pass ]
-[ Debug Sierra+ ] media/click-placeholder-not-pausing.html [ Skip ]
+[ Sierra+ ] media/click-placeholder-not-pausing.html [ Pass ]
 
 # RTL Scrollbars are enabled on Sierra WebKit2.