Changeset 109921 in webkit

Timestamp:

Mar 6, 2012 8:10:58 AM (12 years ago)

Author:

Philippe Normand

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:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• media/video-played-collapse-expected.txt (modified) (2 diffs)
• media/video-played-collapse.html (modified) (1 diff)
• platform/gtk/test_expectations.txt (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-06  Philippe Normand  <pnormand@igalia.com>
+
+        [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  <ulan@chromium.org>
 

trunk/LayoutTests/media/video-played-collapse-expected.txt

@@ -31 +31 @@
 Test 11 OK
 Test 12 OK
+
+Test looping
+RUN(video.loop = true)
 RUN(video.play())
 RUN(video.pause())
@@ -37 +40 @@
 Test 14 OK
 Test 15 OK
+Test 16 OK
+Test 17 OK
 END OF TEST
 

trunk/LayoutTests/media/video-played-collapse.html

@@ -67 +67 @@
             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
-
-                timeRangeCount++;
-                expectedStartTimes[timeRangeCount-1] = newTime;
-                expectedEndTimes[timeRangeCount-1] = video.duration.toFixed(2);
+                // We will end in the very first time range
+                currentTimeRange = 0; 
 
                 willPauseInExistingRange = true;
                 willExtendAnExistingRange = true;
 
-                playForMillisecs(100); // Triggers pause()
+                // Playing from near the end so we will create a new time range from startTime .. duration
+                timeRangeCount++;
+                expectedStartTimes[timeRangeCount-1] = startTime;
+                expectedEndTimes[timeRangeCount-1] = video.duration.toFixed(2);
+
+                // Have to play for long enough to loop and play into the existing range.
+                var playDuration = 1.25;
+
+                // Playback restarts from beginning, so expect the beginning of first time range to be 0.
+                expectedStartTimes[0] = 0;
+                playForMillisecs(secToMilli(playDuration)); // Triggers pause()
             }
 

trunk/LayoutTests/platform/gtk/test_expectations.txt

@@ -15 +15 @@
 
 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