From 2a25a969731da40dbcf3468ff58713ea5c643484 Mon Sep 17 00:00:00 2001 From: Ilya Nikolaevskiy Date: Thu, 3 Jun 2021 10:58:44 +0200 Subject: [PATCH] Disable flacky tests on mac bots MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:12846 Change-Id: I4bde0e2533e499c0dcc92582288c3c22a2662b08 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/221201 Reviewed-by: Henrik Boström Commit-Queue: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/master@{#34212} --- video/adaptation/overuse_frame_detector_unittest.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/video/adaptation/overuse_frame_detector_unittest.cc b/video/adaptation/overuse_frame_detector_unittest.cc index d4bf910faa..d95ce0f324 100644 --- a/video/adaptation/overuse_frame_detector_unittest.cc +++ b/video/adaptation/overuse_frame_detector_unittest.cc @@ -455,6 +455,8 @@ TEST_F(OveruseFrameDetectorTest, RunOnTqNormalUsage) { EXPECT_TRUE(event.Wait(10000)); } +// TODO(crbug.com/webrtc/12846): investigate why the test fails on MAC bots. +#if !defined(WEBRTC_MAC) TEST_F(OveruseFrameDetectorTest, MaxIntervalScalesWithFramerate) { const int kCapturerMaxFrameRate = 30; const int kEncodeMaxFrameRate = 20; // Maximum fps the encoder can sustain. @@ -490,6 +492,7 @@ TEST_F(OveruseFrameDetectorTest, MaxIntervalScalesWithFramerate) { processing_time_us); overuse_detector_->CheckForOveruse(observer_); } +#endif TEST_F(OveruseFrameDetectorTest, RespectsMinFramerate) { const int kMinFrameRate = 7; // Minimum fps allowed by current detector impl. @@ -821,6 +824,8 @@ TEST_F(OveruseFrameDetectorTest2, ResetAfterFrameTimeout) { EXPECT_EQ(InitialUsage(), UsagePercent()); } +// TODO(crbug.com/webrtc/12846): investigate why the test fails on MAC bots. +#if !defined(WEBRTC_MAC) TEST_F(OveruseFrameDetectorTest2, ConvergesSlowly) { overuse_detector_->SetOptions(options_); InsertAndSendFramesWithInterval(1, kFrameIntervalUs, kWidth, kHeight, @@ -842,6 +847,7 @@ TEST_F(OveruseFrameDetectorTest2, ConvergesSlowly) { kProcessTimeUs); EXPECT_NEAR(UsagePercent(), 20, 5); } +#endif TEST_F(OveruseFrameDetectorTest2, InitialProcessingUsage) { overuse_detector_->SetOptions(options_);