[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87
philn at webkit.org
philn at webkit.org
Wed Jan 20 22:24:09 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 0ad10d4176b8272da6c75bb923582ecfc2e9f333
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 14 12:11:44 2010 +0000
2010-01-13 Philippe Normand <pnormand at igalia.com>
Reviewed by Xan Lopez.
[GTK] Failing media/video-seek-past-end-playing.html
https://bugs.webkit.org/show_bug.cgi?id=33015
* media/video-seek-past-end-playing.html: Removed the last timer of this test.
* platform/gtk/Skipped: Unskip test above.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bbf8743..24dfb52 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-13 Philippe Normand <pnormand at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Failing media/video-seek-past-end-playing.html
+ https://bugs.webkit.org/show_bug.cgi?id=33015
+
+ * media/video-seek-past-end-playing.html: Removed the last timer of this test.
+ * platform/gtk/Skipped: Unskip test above.
+
2010-01-14 Eric Seidel <eric at webkit.org>
No review, rolling out r53249.
diff --git a/LayoutTests/media/video-seek-past-end-playing.html b/LayoutTests/media/video-seek-past-end-playing.html
index 15b0fd7..8b4b681 100644
--- a/LayoutTests/media/video-seek-past-end-playing.html
+++ b/LayoutTests/media/video-seek-past-end-playing.html
@@ -26,22 +26,20 @@
// make sure time is advancing and seek past end
testExpected("mediaElement.currentTime", 0, '>');
run("video.currentTime = 500");
- setTimeout(seekCheck, 200);
+ } else if (timeupdateEventCount == 10) {
+ // Wait some more timeupdate events so we can check the
+ // media engine performed the seek.
+ consoleWrite("");
+ testExpected("video.paused", false);
+ testExpected("mediaElement.currentTime", 0, '>');
+ consoleWrite("");
+ // reset the counter to prevent infinite loop if the
+ // test is re-executed manually.
+ timeupdateEventCount = 0;
+ endTest();
}
}
- function seekCheck()
- {
- consoleWrite("");
- testExpected("video.paused", false);
- testExpected("mediaElement.currentTime", 0, '>');
- consoleWrite("");
- // reset the counter to prevent infinite loop if the
- // test is re-executed manually.
- timeupdateEventCount = 0;
- endTest();
- }
-
mediaElement.addEventListener("timeupdate", timeupdate);
var mediaFile = findMediaFile("video", "content/test");
run("video.src = '" + mediaFile + "'");
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 020a098..1f29701 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5745,6 +5745,3 @@ fast/profiler/dead-time.html
# Fails on and off (more often fails) on the release bot
media/event-attributes.html
-
-# Fails on release bot, see https://bugs.webkit.org/show_bug.cgi?id=33015
-media/video-seek-past-end-playing.html
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list