summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authormachenbach@chromium.org <machenbach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-24 12:41:21 +0000
committermachenbach@chromium.org <machenbach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-24 12:41:21 +0000
commit69fb107028a0e6009a0dd0dbc3a4aede9cd6944a (patch)
treec3a52e83712a548e1370e2ef5fe3d16077bfd47a /media
parente59f44088b630fab61069a89e6af242fb01d5576 (diff)
downloadchromium_src-69fb107028a0e6009a0dd0dbc3a4aede9cd6944a.zip
chromium_src-69fb107028a0e6009a0dd0dbc3a4aede9cd6944a.tar.gz
chromium_src-69fb107028a0e6009a0dd0dbc3a4aede9cd6944a.tar.bz2
[Sheriff] Disabled failing test on windows.
BUG=297564 TBR=ycheo@chromium.org Review URL: https://codereview.chromium.org/24376008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/filters/source_buffer_stream_unittest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/media/filters/source_buffer_stream_unittest.cc b/media/filters/source_buffer_stream_unittest.cc
index d0d4df2..14bae31 100644
--- a/media/filters/source_buffer_stream_unittest.cc
+++ b/media/filters/source_buffer_stream_unittest.cc
@@ -2594,7 +2594,13 @@ TEST_F(SourceBufferStreamTest, GetRemovalRange_BytesToFree) {
EXPECT_EQ(18, bytes_removed);
}
-TEST_F(SourceBufferStreamTest, GetRemovalRange_Range) {
+// Disabled as test fails on windows: http://crbug.com/297564 .
+#if defined(OS_WIN)
+#define MAYBE_GetRemovalRange_Range DISABLED_GetRemovalRange_Range
+#else
+#define MAYBE_GetRemovalRange_Range GetRemovalRange_Range
+#endif
+TEST_F(SourceBufferStreamTest, MAYBE_GetRemovalRange_Range) {
// Append 2 GOPs starting at 300ms, 30ms apart.
NewSegmentAppend("300K 330 360 390K 420 450");