From 6ed136c6ae6d1be92d3b868f503f309597fc475c Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Wed, 24 Jul 2024 17:26:35 +0200 Subject: [PATCH] Fix TestExtendedReportsCanSignalZeroTargetBitrate flakiness on Mac. The test is flaky on Mac on it seems related to a timeout. https://luci-analysis.appspot.com/p/webrtc/clusters/testname-v4/82d0b764552f0811b37cc651c0962399?tab=recent-failures ../../video/end_to_end_tests/extended_reports_tests.cc:196: Failure Value of: Wait() Actual: false Expected: true Timed out while waiting for RTCP SR/RR packets to be sent. Change-Id: I9b19d3952a761415ab65d15f188ae3336e43e97e Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/357820 Commit-Queue: Jeremy Leconte Reviewed-by: Sergey Silkin Cr-Commit-Position: refs/heads/main@{#42672} --- video/end_to_end_tests/extended_reports_tests.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/video/end_to_end_tests/extended_reports_tests.cc b/video/end_to_end_tests/extended_reports_tests.cc index 21562da3e8..9ce5311df1 100644 --- a/video/end_to_end_tests/extended_reports_tests.cc +++ b/video/end_to_end_tests/extended_reports_tests.cc @@ -21,6 +21,7 @@ #include "api/task_queue/task_queue_base.h" #include "api/test/simulated_network.h" #include "api/units/data_rate.h" +#include "api/units/time_delta.h" #include "api/video_codecs/sdp_video_format.h" #include "call/call.h" #include "call/fake_network_pipe.h" @@ -64,8 +65,9 @@ class RtcpXrObserver : public test::EndToEndTest { RtcpXrObserver(bool enable_rrtr, bool expect_target_bitrate, bool enable_zero_target_bitrate, - VideoEncoderConfig::ContentType content_type) - : EndToEndTest(test::VideoTestConstants::kDefaultTimeout), + VideoEncoderConfig::ContentType content_type, + TimeDelta timeout = test::VideoTestConstants::kDefaultTimeout) + : EndToEndTest(timeout), enable_rrtr_(enable_rrtr), expect_target_bitrate_(expect_target_bitrate), enable_zero_target_bitrate_(enable_zero_target_bitrate), @@ -260,7 +262,8 @@ TEST_F(ExtendedReportsEndToEndTest, TestExtendedReportsCanSignalZeroTargetBitrate) { RtcpXrObserver test(/*enable_rrtr=*/false, /*expect_target_bitrate=*/true, /*enable_zero_target_bitrate=*/true, - VideoEncoderConfig::ContentType::kScreen); + VideoEncoderConfig::ContentType::kScreen, + test::VideoTestConstants::kLongTimeout); RunBaseTest(&test); } } // namespace webrtc