From 322a9e42f8cd6652d1f8ed9324ae9429f27b74cd Mon Sep 17 00:00:00 2001 From: tommi Date: Tue, 28 Feb 2017 02:12:57 -0800 Subject: [PATCH] Handle TimeUntilNextProcess in StartupShutdownWithExternalADM BUG=webrtc:7258 Review-Url: https://codereview.webrtc.org/2719113002 Cr-Commit-Position: refs/heads/master@{#16894} --- webrtc/media/engine/webrtcvoiceengine_unittest.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webrtc/media/engine/webrtcvoiceengine_unittest.cc b/webrtc/media/engine/webrtcvoiceengine_unittest.cc index a08ac6a92e..38d224393c 100644 --- a/webrtc/media/engine/webrtcvoiceengine_unittest.cc +++ b/webrtc/media/engine/webrtcvoiceengine_unittest.cc @@ -3507,6 +3507,9 @@ TEST(WebRtcVoiceEngineTest, StartupShutdownWithExternalADM) { testing::NiceMock adm; EXPECT_CALL(adm, AddRef()).Times(3).WillRepeatedly(Return(0)); EXPECT_CALL(adm, Release()).Times(3).WillRepeatedly(Return(0)); + // Return 100ms just in case this function gets called. If we don't, + // we could enter a tight loop since the mock would return 0. + EXPECT_CALL(adm, TimeUntilNextProcess()).WillRepeatedly(Return(100)); { cricket::WebRtcVoiceEngine engine( &adm, webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr);