Diff
Modified: branches/safari-537-branch/LayoutTests/ChangeLog (152172 => 152173)
--- branches/safari-537-branch/LayoutTests/ChangeLog 2013-06-28 16:39:33 UTC (rev 152172)
+++ branches/safari-537-branch/LayoutTests/ChangeLog 2013-06-28 16:50:23 UTC (rev 152173)
@@ -1,3 +1,30 @@
+2013-06-28 Jessie Berlin <[email protected]>
+
+ Merge r151942
+
+ 2013-06-24 Jer Noble <[email protected]>
+
+ [Mac] media/video-played-collapse.html is flakey on certain platforms.
+ https://bugs.webkit.org/show_bug.cgi?id=117034
+
+ Reviewed by Beth Dakin.
+
+ This test does not wait until a seek completes before issuing a play()
+ command during its subtests. This can cause flakiness on some platforms
+ where playback will begin from the pre-seek currentTime. Wait for the seek
+ to complete before continuing the sub-tests.
+
+ Additionally, a 2s watchdog timeout is present to catch stalled tests. This
+ timeout is fine for short-duration sub-tests, but longer tests' durations
+ approach this 2s timeout period. Make the timeout the test duration + 2s.
+
+ * media/video-played-collapse-expected.txt:
+ * media/video-played-collapse.html:
+ * media/video-played.js:
+ (playForMillisecs.callPauseIfTimeIsReached):
+ (playForMillisecs):
+ * platform/mac-wk2/TestExpectations:
+
2013-06-27 Jessie Berlin <[email protected]>
Merge a file from r151836 that was lost in the r152027 merge.
Modified: branches/safari-537-branch/LayoutTests/media/video-played-collapse-expected.txt (152172 => 152173)
--- branches/safari-537-branch/LayoutTests/media/video-played-collapse-expected.txt 2013-06-28 16:39:33 UTC (rev 152172)
+++ branches/safari-537-branch/LayoutTests/media/video-played-collapse-expected.txt 2013-06-28 16:50:23 UTC (rev 152173)
@@ -6,6 +6,7 @@
Test 1 OK
Test playing when there are no ranges
+EVENT(seeked)
RUN(video.play())
RUN(video.pause())
EVENT(pause)
@@ -14,6 +15,7 @@
Test 4 OK
Create a new range
+EVENT(seeked)
RUN(video.play())
RUN(video.pause())
EVENT(pause)
@@ -24,6 +26,7 @@
Test 9 OK
Test playing from one range into another, should collapse the two ranges
+EVENT(seeked)
RUN(video.play())
RUN(video.pause())
EVENT(pause)
@@ -33,6 +36,7 @@
Test looping
RUN(video.loop = true)
+EVENT(seeked)
RUN(video.play())
RUN(video.pause())
EVENT(pause)
Modified: branches/safari-537-branch/LayoutTests/media/video-played-collapse.html (152172 => 152173)
--- branches/safari-537-branch/LayoutTests/media/video-played-collapse.html 2013-06-28 16:39:33 UTC (rev 152172)
+++ branches/safari-537-branch/LayoutTests/media/video-played-collapse.html 2013-06-28 16:50:23 UTC (rev 152173)
@@ -30,7 +30,8 @@
runSilently("video.currentTime = 0.5");
currentTimeRange++;
- startPlayingInNewRange();
+
+ waitForEventOnce("seeked", startPlayingInNewRange);
}
@@ -44,7 +45,7 @@
willPauseInExistingRange = false;
willExtendAnExistingRange = false;
- startPlayingInNewRange();
+ waitForEventOnce("seeked", startPlayingInNewRange);
}
function JumpAndCollapseTwoRanges()
@@ -61,7 +62,9 @@
willExtendAnExistingRange = false;
runSilently("video.currentTime = " + startTime);
- playForMillisecs(secToMilli(expectedEndTimes[1] - startTime + 0.1)); // Triggers pause()
+ waitForEventOnce("seeked", function() {
+ playForMillisecs(secToMilli(expectedEndTimes[1] - startTime + 0.1)); // Triggers pause()
+ });
}
function TestLoopingAndPassToTheEnd()
@@ -89,7 +92,10 @@
// Playback restarts from beginning, so expect the beginning of first time range to be 0.
expectedStartTimes[0] = 0;
- playForMillisecs(secToMilli(playDuration)); // Triggers pause()
+
+ waitForEventOnce("seeked", function() {
+ playForMillisecs(secToMilli(playDuration)); // Triggers pause()
+ });
}
</script>
Modified: branches/safari-537-branch/LayoutTests/media/video-played.js (152172 => 152173)
--- branches/safari-537-branch/LayoutTests/media/video-played.js 2013-06-28 16:39:33 UTC (rev 152172)
+++ branches/safari-537-branch/LayoutTests/media/video-played.js 2013-06-28 16:50:23 UTC (rev 152173)
@@ -124,7 +124,7 @@
}
var elapsed = nowInSecs() - startTime;
- if (elapsed > 2) {
+ if (elapsed > 2 + playDuration) {
// Just in case something goes wrong.
failTest("ERROR: test stalled, waited " + elapsed + " seconds for movie to play " + playedTime + " seconds");
return;
Modified: branches/safari-537-branch/LayoutTests/platform/mac-wk2/TestExpectations (152172 => 152173)
--- branches/safari-537-branch/LayoutTests/platform/mac-wk2/TestExpectations 2013-06-28 16:39:33 UTC (rev 152172)
+++ branches/safari-537-branch/LayoutTests/platform/mac-wk2/TestExpectations 2013-06-28 16:50:23 UTC (rev 152173)
@@ -316,6 +316,8 @@
webkit.org/b/117767 media/broken-video.html [ Failure ]
webkit.org/b/117767 media/event-attributes.html [ Failure ]
+webkit.org/b/117962 [ MountainLion ] media/video-played-collapse.html [ Skip ]
+
### END OF (1) Classified failures with bug reports
########################################
