summaryrefslogtreecommitdiffstats
path: root/media/filters
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-01 05:09:30 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-01 05:09:30 +0000
commitdfb4832e310bbd581d7d8ac2e8ce798e1faf3ef5 (patch)
tree4df4a446d5499b4bc455b0391c53c16ebfc0c4a6 /media/filters
parent06d248c1b0fc34b993740edbed06c67a2e7de68a (diff)
downloadchromium_src-dfb4832e310bbd581d7d8ac2e8ce798e1faf3ef5.zip
chromium_src-dfb4832e310bbd581d7d8ac2e8ce798e1faf3ef5.tar.gz
chromium_src-dfb4832e310bbd581d7d8ac2e8ce798e1faf3ef5.tar.bz2
Loosen expectations for VideoRendererImplTest.Rebuffer*.
Some bots have reported the Display() callback being called more than once. BUG=365516 Review URL: https://codereview.chromium.org/262693003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/filters')
-rw-r--r--media/filters/video_renderer_impl_unittest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/filters/video_renderer_impl_unittest.cc b/media/filters/video_renderer_impl_unittest.cc
index 84ccc9e..4b43e3b 100644
--- a/media/filters/video_renderer_impl_unittest.cc
+++ b/media/filters/video_renderer_impl_unittest.cc
@@ -26,6 +26,7 @@
using ::testing::_;
using ::testing::AnyNumber;
+using ::testing::AtLeast;
using ::testing::InSequence;
using ::testing::Invoke;
using ::testing::NiceMock;
@@ -504,7 +505,7 @@ TEST_F(VideoRendererImplTest, Rebuffer) {
// TODO(scherkus): We shouldn't display the next ready frame in a rebuffer
// situation, see http://crbug.com/365516
- EXPECT_CALL(mock_display_cb_, Display(_));
+ EXPECT_CALL(mock_display_cb_, Display(_)).Times(AtLeast(1));
event.RunAndWaitForStatus(PIPELINE_OK);
@@ -529,7 +530,7 @@ TEST_F(VideoRendererImplTest, Rebuffer_AlreadyHaveEnoughFrames) {
// TODO(scherkus): We shouldn't display the next ready frame in a rebuffer
// situation, see http://crbug.com/365516
- EXPECT_CALL(mock_display_cb_, Display(_));
+ EXPECT_CALL(mock_display_cb_, Display(_)).Times(AtLeast(1));
WaitableMessageLoopEvent event;
renderer_->Preroll(kNoTimestamp(),