From f0d7b2b5077fd3fb655ea76b8b6e3c4b8ab8afef Mon Sep 17 00:00:00 2001 From: tommi Date: Fri, 3 Mar 2017 01:34:15 -0800 Subject: [PATCH] Make sure that ApmHelpersTest tests don't enter a tight loop. BUG=webrtc:7219, webrtc:7290 TBR=solenberg@webrtc.org Review-Url: https://codereview.webrtc.org/2729133002 Cr-Commit-Position: refs/heads/master@{#16996} --- webrtc/media/engine/apm_helpers_unittest.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/webrtc/media/engine/apm_helpers_unittest.cc b/webrtc/media/engine/apm_helpers_unittest.cc index 80b03ad0e1..8c28db703c 100644 --- a/webrtc/media/engine/apm_helpers_unittest.cc +++ b/webrtc/media/engine/apm_helpers_unittest.cc @@ -25,6 +25,11 @@ constexpr AgcConfig kDefaultAgcConfig = { 3, 9, true }; struct TestHelper { TestHelper() { + // Reply with a 10ms timer every time TimeUntilNextProcess is called to + // avoid entering a tight loop on the process thread. + EXPECT_CALL(mock_audio_device_, TimeUntilNextProcess()) + .WillRepeatedly(testing::Return(10)); + // This replicates the conditions from voe_auto_test. Config config; config.Set(new ExperimentalAgc(false));