summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-23 17:47:56 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-23 17:47:56 +0000
commit9da5ef94f74103a92ac6341814b1e4717e7af05d (patch)
tree0bddb43afcaac23f0909549cf608e24a670d136c /media
parent71983653d80f9cf3fb5911f3546f7e8cfbca1612 (diff)
downloadchromium_src-9da5ef94f74103a92ac6341814b1e4717e7af05d.zip
chromium_src-9da5ef94f74103a92ac6341814b1e4717e7af05d.tar.gz
chromium_src-9da5ef94f74103a92ac6341814b1e4717e7af05d.tar.bz2
Disabling FFmpegDemuxerTest.* due to flakiness.
BUG=10863 Review URL: http://codereview.chromium.org/92049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/filters/ffmpeg_demuxer_unittest.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 8e7d3f3..167a212 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -252,7 +252,8 @@ class TestReader : public base::RefCountedThreadSafe<TestReader> {
} // namespace
-TEST(FFmpegDemuxerTest, InitializeFailure) {
+// TODO(scherkus): http://crbug.com/10863
+TEST(FFmpegDemuxerTest, DISABLED_InitializeFailure) {
InitializeFFmpegMocks();
// Get FFmpegDemuxer's filter factory.
@@ -315,7 +316,8 @@ TEST(FFmpegDemuxerTest, InitializeFailure) {
EXPECT_FALSE(filter_host->IsInitialized());
}
-TEST(FFmpegDemuxerTest, InitializeStreams) {
+// TODO(scherkus): http://crbug.com/10863
+TEST(FFmpegDemuxerTest, DISABLED_InitializeStreams) {
// Simulate media with a data stream, a video stream and audio stream.
InitializeFFmpegMocks();
g_format.nb_streams = 3;
@@ -403,7 +405,9 @@ TEST(FFmpegDemuxerTest, InitializeStreams) {
// TODO(scherkus): as we keep refactoring and improving our mocks (both FFmpeg
// and pipeline/filters), try to break this test into two. Big issue right now
// is that it takes ~50 lines of code just to set up FFmpegDemuxer.
-TEST(FFmpegDemuxerTest, ReadAndSeek) {
+//
+// TODO(scherkus): http://crbug.com/10863
+TEST(FFmpegDemuxerTest, DISABLED_ReadAndSeek) {
// Prepare some test data.
const int kAudio = 0;
const int kVideo = 1;