Title: [126364] trunk/LayoutTests
Revision
126364
Author
ann...@chromium.org
Date
2012-08-22 15:55:30 -0700 (Wed, 22 Aug 2012)

Log Message

[Chromium/GTK/EFL] Flaky media/track/track-mode test.
https://bugs.webkit.org/show_bug.cgi?id=83878

Reviewed by Eric Seidel.

This test should only care that cuechange events are fired when the TextTrack
mode is set to HIDDEN or SHOWING.  Because the events are asynchronous, we
shouldn't test the order of them, just that they occur.

* media/track/track-mode-expected.txt:
* media/track/track-mode.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (126363 => 126364)


--- trunk/LayoutTests/ChangeLog	2012-08-22 22:52:16 UTC (rev 126363)
+++ trunk/LayoutTests/ChangeLog	2012-08-22 22:55:30 UTC (rev 126364)
@@ -1,3 +1,17 @@
+2012-08-22  Anna Cavender  <ann...@chromium.org>
+
+        [Chromium/GTK/EFL] Flaky media/track/track-mode test.
+        https://bugs.webkit.org/show_bug.cgi?id=83878
+
+        Reviewed by Eric Seidel.
+
+        This test should only care that cuechange events are fired when the TextTrack
+        mode is set to HIDDEN or SHOWING.  Because the events are asynchronous, we
+        shouldn't test the order of them, just that they occur.
+
+        * media/track/track-mode-expected.txt:
+        * media/track/track-mode.html:
+
 2012-08-22  Leo Yang  <leoy...@rim.com>
 
         Test cases under fast/filesystem/workers are flaky when using JSC

Modified: trunk/LayoutTests/media/track/track-mode-expected.txt (126363 => 126364)


--- trunk/LayoutTests/media/track/track-mode-expected.txt	2012-08-22 22:52:16 UTC (rev 126363)
+++ trunk/LayoutTests/media/track/track-mode-expected.txt	2012-08-22 22:55:30 UTC (rev 126364)
@@ -31,16 +31,9 @@
 EXPECTED (video.textTracks[0].mode == '2') OK
 EXPECTED (textTrack.cues.length == '3') OK
 
-++ 4 events expected while mode = TextTrack.SHOWING
+++ at least 3 events expected while mode = TextTrack.SHOWING
 EVENT(cuechange)
-Cue entered: ipsum
-EXPECTED (textTrack.activeCues.length == '1') OK
 EVENT(cuechange)
-EXPECTED (textTrack.activeCues.length == '0') OK
 EVENT(cuechange)
-Cue entered: dolor
-EXPECTED (textTrack.activeCues.length == '1') OK
-EVENT(cuechange)
-EXPECTED (textTrack.activeCues.length == '0') OK
 END OF TEST
 

Modified: trunk/LayoutTests/media/track/track-mode.html (126363 => 126364)


--- trunk/LayoutTests/media/track/track-mode.html	2012-08-22 22:52:16 UTC (rev 126363)
+++ trunk/LayoutTests/media/track/track-mode.html	2012-08-22 22:55:30 UTC (rev 126364)
@@ -61,20 +61,14 @@
                 consoleWrite("<b>++ 'TextTrack.SHOWING'</b>");
                 setMode(TextTrack.SHOWING);
 
-                consoleWrite("++ " + (textTrack.cues.length - 1) * 2 + " events expected while mode = TextTrack.SHOWING");
+                consoleWrite("++ at least " + textTrack.cues.length + " events expected while mode = TextTrack.SHOWING");
             }
             
             waitForEvent('cuechange',
                 function (event)
                 {
-                    // Expect a cuechange event for enter and exit of each cue.
-                    if (textTrack.activeCues.length > 0)
-                        consoleWrite("Cue entered: " + textTrack.activeCues[0].text);
-
-                    // Alternate between cue enter and cue exit.
-                    testExpected("textTrack.activeCues.length", cueCount % 2 ? 0 : 1);
                     cueCount++;
-                    if (cueCount == (textTrack.cues.length - 1) * 2)
+                    if (cueCount == textTrack.cues.length)
                         endTest();
 
                 }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to