Title: [109921] trunk/LayoutTests
Revision
109921
Author
[email protected]
Date
2012-03-06 08:10:58 -0800 (Tue, 06 Mar 2012)

Log Message

[GStreamer] media/video-played-collapse.html
https://bugs.webkit.org/show_bug.cgi?id=36165

Reviewed by Eric Carlson.

Refactored the test to minimize flakiness risks.

* media/video-played-collapse-expected.txt:
* media/video-played-collapse.html:
* platform/gtk/test_expectations.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (109920 => 109921)


--- trunk/LayoutTests/ChangeLog	2012-03-06 16:10:17 UTC (rev 109920)
+++ trunk/LayoutTests/ChangeLog	2012-03-06 16:10:58 UTC (rev 109921)
@@ -1,3 +1,16 @@
+2012-03-06  Philippe Normand  <[email protected]>
+
+        [GStreamer] media/video-played-collapse.html
+        https://bugs.webkit.org/show_bug.cgi?id=36165
+
+        Reviewed by Eric Carlson.
+
+        Refactored the test to minimize flakiness risks.
+
+        * media/video-played-collapse-expected.txt:
+        * media/video-played-collapse.html:
+        * platform/gtk/test_expectations.txt:
+
 2012-03-06  Ulan Degenbaev  <[email protected]>
 
         TypedArray subarray call for subarray does not clamp the end index parameter properly

Modified: trunk/LayoutTests/media/video-played-collapse-expected.txt (109920 => 109921)


--- trunk/LayoutTests/media/video-played-collapse-expected.txt	2012-03-06 16:10:17 UTC (rev 109920)
+++ trunk/LayoutTests/media/video-played-collapse-expected.txt	2012-03-06 16:10:58 UTC (rev 109921)
@@ -30,11 +30,16 @@
 Test 10 OK
 Test 11 OK
 Test 12 OK
+
+Test looping
+RUN(video.loop = true)
 RUN(video.play())
 RUN(video.pause())
 EVENT(pause)
 Test 13 OK
 Test 14 OK
 Test 15 OK
+Test 16 OK
+Test 17 OK
 END OF TEST
 

Modified: trunk/LayoutTests/media/video-played-collapse.html (109920 => 109921)


--- trunk/LayoutTests/media/video-played-collapse.html	2012-03-06 16:10:17 UTC (rev 109920)
+++ trunk/LayoutTests/media/video-played-collapse.html	2012-03-06 16:10:58 UTC (rev 109921)
@@ -66,24 +66,30 @@
 
             function TestLoopingAndPassToTheEnd()
             {
-                playForMillisecs(100); // Triggers pause()
-                return;
                 consoleWrite("<br><b><em>Test looping</em></b>");
-    
-                var newTime = (video.duration - 0.05).toFixed(2);
-                runSilently("video.currentTime = " + newTime);
+
+                // Start playing near the end of the movie so it will loop quickly.
                 run("video.loop = true");
+                var startTime = (video.duration - 0.05).toFixed(2);
+                runSilently("video.currentTime = " + startTime);
                 
-                currentTimeRange = 0; // We'll end in the very first time range
+                // We will end in the very first time range
+                currentTimeRange = 0; 
 
+                willPauseInExistingRange = true;
+                willExtendAnExistingRange = true;
+
+                // Playing from near the end so we will create a new time range from startTime .. duration
                 timeRangeCount++;
-                expectedStartTimes[timeRangeCount-1] = newTime;
+                expectedStartTimes[timeRangeCount-1] = startTime;
                 expectedEndTimes[timeRangeCount-1] = video.duration.toFixed(2);
 
-                willPauseInExistingRange = true;
-                willExtendAnExistingRange = true;
+                // Have to play for long enough to loop and play into the existing range.
+                var playDuration = 1.25;
 
-                playForMillisecs(100); // Triggers pause()
+                // Playback restarts from beginning, so expect the beginning of first time range to be 0.
+                expectedStartTimes[0] = 0;
+                playForMillisecs(secToMilli(playDuration)); // Triggers pause()
             }
 
         </script>

Modified: trunk/LayoutTests/platform/gtk/test_expectations.txt (109920 => 109921)


--- trunk/LayoutTests/platform/gtk/test_expectations.txt	2012-03-06 16:10:17 UTC (rev 109920)
+++ trunk/LayoutTests/platform/gtk/test_expectations.txt	2012-03-06 16:10:58 UTC (rev 109921)
@@ -14,7 +14,6 @@
 // Flaky tests
 
 BUGWK68878 : media/video-playing-and-pause.html = PASS TEXT
-BUGWK36165 : media/video-played-collapse.html = PASS TEXT
 BUGWK54637 : media/video-display-toggle.html = PASS TEXT
 BUGWK54637 : media/video-controls-in-media-document.html = PASS TEXT
 BUGWK54637 : media/controls-after-reload.html = PASS TEXT
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to