summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-04 02:51:06 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-04 02:51:06 +0000
commit46012f109086b9548fbcfb2e620c757eadf88bea (patch)
treec83b75de3ba2da03a8e9545d3336d5a6c281051a /webkit
parentee76c7f379bdf44ca1589266006470ef55b4adbf (diff)
downloadchromium_src-46012f109086b9548fbcfb2e620c757eadf88bea.zip
chromium_src-46012f109086b9548fbcfb2e620c757eadf88bea.tar.gz
chromium_src-46012f109086b9548fbcfb2e620c757eadf88bea.tar.bz2
media/video-currentTime-set.html is timing out with latest ffmpeg roll
BUG=35492 TEST=webkit/tools/layout_tests/run_webkit_tests.sh media Review URL: http://codereview.chromium.org/669033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index efe28e3..96a253e 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -745,7 +745,6 @@ BUG13907 SKIP : http/tests/media = FAIL
BUG13907 BUG25094 LINUX DEBUG : media = PASS FAIL TIMEOUT
// These tests should be passing. Remove them once confirmed they're not flaky.
-BUG9798 BUG13907 : media/video-currentTime-set.html = PASS FAIL
BUG9798 BUG13907 SLOW WIN LINUX : media/video-played-collapse.html = PASS FAIL
BUG9798 BUG13907 SLOW MAC : media/video-played-collapse.html = PASS
@@ -2812,6 +2811,7 @@ BUG35492 MAC LINUX : media/video-played-ranges-1.html = FAIL PASS
BUG35492 : media/video-played-reset.html = FAIL
BUG35492 : media/video-display-toggle.html = CRASH FAIL PASS
BUG35492 : media/controls-drag-timebar.html = FAIL TIMEOUT
+BUG35492 : media/video-currentTime-set.html = FAIL TIMEOUT
// Previous to FFmpeg roll expectations
//BUG9798 BUG13907 SLOW LINUX MAC RELEASE : media/video-played-ranges-1.html = FAIL
//BUG9798 BUG13907 SLOW WIN RELEASE : media/video-played-ranges-1.html = FAIL
@@ -2821,7 +2821,7 @@ BUG35492 : media/controls-drag-timebar.html = FAIL TIMEOUT
//BUG9798 BUG13907 SLOW WIN RELEASE : media/video-played-ranges-1.html = PASS FAIL
//BUG9798 BUG13907 SLOW MAC WIN RELEASE : media/video-played-reset.html = PASS
//BUG9798 BUG13907 SLOW LINUX DEBUG : media/video-played-reset.html = PASS
-
+//BUG9798 BUG13907 : media/video-currentTime-set.html = PASS FAIL
// The test was added in WebKit r54766 and timeouts in Chromium
BUG13907 : media/video-display-aspect-ratio.html = TIMEOUT PASS