Changeset 116148 in webkit

Timestamp:

May 4, 2012 12:53:55 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Layout Test media/track/track-cues-pause-on-exit.html is flaky on chromium debug builds
​https://bugs.webkit.org/show_bug.cgi?id=80067

Patch by Victor Carbune <​vcarbune@adobe.com> on 2012-05-04
Reviewed by Eric Carlson.

Trying a different approach, blocking on waitForEvent for the video element.

• media/track/track-cues-pause-on-exit-expected.txt: Updated.
• media/track/track-cues-pause-on-exit.html: Changed to use

waitForEvent and listen to exit events right after.

• media/video-test.js: Updated waitForEvent to enable listening for

events on other elements as well.
(waitForEvent._eventCallback):
(waitForEvent):

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• media/track/track-cues-pause-on-exit-expected.txt (modified) (2 diffs)
• media/track/track-cues-pause-on-exit.html (modified) (2 diffs)
• media/video-test.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-04  Victor Carbune  <vcarbune@adobe.com>
+
+        Layout Test media/track/track-cues-pause-on-exit.html is flaky on chromium debug builds
+        https://bugs.webkit.org/show_bug.cgi?id=80067
+
+        Reviewed by Eric Carlson.
+
+        Trying a different approach, blocking on waitForEvent for the video element.
+
+        * media/track/track-cues-pause-on-exit-expected.txt: Updated.
+        * media/track/track-cues-pause-on-exit.html: Changed to use
+        waitForEvent and listen to exit events right after.
+        * media/video-test.js: Updated waitForEvent to enable listening for
+        events on other elements as well.
+        (waitForEvent._eventCallback):
+        (waitForEvent):
+
 2012-05-04  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
 

trunk/LayoutTests/media/track/track-cues-pause-on-exit-expected.txt

@@ -7 +7 @@
 EXPECTED (video.paused == 'false') OK
 
+EVENT(pause)
 EVENT(exit)
 EXPECTED (currentCue.id == '0') OK
@@ -12 +13 @@
 RUN(video.play())
 
-EVENT(exit)
-EXPECTED (currentCue.id == '1') OK
-EXPECTED (video.paused == 'false') OK
-
+EVENT(pause)
 EVENT(exit)
 EXPECTED (currentCue.id == '2') OK
 EXPECTED (video.paused == 'true') OK
 RUN(video.play())
-
-EVENT(exit)
-EXPECTED (currentCue.id == '3') OK
-EXPECTED (video.paused == 'false') OK
 END OF TEST
 

trunk/LayoutTests/media/track/track-cues-pause-on-exit.html

@@ -25 +25 @@
                 for (var i = 0; i < testTrack.track.cues.length; ++i) {
                     testTrack.track.cues[i].pauseOnExit = (i % 2 == 0);
-                    testTrack.track.cues[i].addEventListener('exit', cueExited);
                 }
 
                 run("video.play()");
                 testExpected("video.paused", false);
+                consoleWrite("");
+
+                waitForEvent('pause', function() {
+                    waitForEvent('exit', cueExited, false, true, testTrack.track.cues[currentCueNumber]);
+                });
             }
 
@@ -36 +40 @@
                 currentCue = evt.target;
 
-                consoleWrite("");
-                consoleWrite("EVENT("+evt.type+")");
 
                 testExpected("currentCue.id", currentCueNumber);
-                testExpected("video.paused", currentCueNumber % 2 == 0);
+                testExpected("video.paused", true);
 
-                if (currentCueNumber % 2 == 0)
-                    run("video.play()");
+                run("video.play()");
 
-                if (currentCueNumber == 3)
+                if (currentCueNumber == 2)
                     endTest();
 
-                currentCueNumber++;
+                currentCueNumber += 2;
+
+                consoleWrite("");
             }
 

trunk/LayoutTests/media/video-test.js

@@ -156 +156 @@
 }
 
-function waitForEvent(eventName, func, endit, oneTimeOnly)
-{
+function waitForEvent(eventName, func, endit, oneTimeOnly, element)
+{
+    if (!element)
+        element = mediaElement;
+
     function _eventCallback(event)
     {
         if (oneTimeOnly)
-            mediaElement.removeEventListener(eventName, _eventCallback, true);
+            element.removeEventListener(eventName, _eventCallback, true);
 
         consoleWrite("EVENT(" + eventName + ")");
@@ -172 +175 @@
     }
 
-    mediaElement.addEventListener(eventName, _eventCallback, true);
+    element.addEventListener(eventName, _eventCallback, true);
 }