From 85904f4ee8b4526ff32dcff31183af1317af86eb Mon Sep 17 00:00:00 2001 From: Taylor Brandstetter Date: Fri, 16 Feb 2018 10:11:49 -0800 Subject: [PATCH] Disabling a couple flaky CallPerfTests on Mac. Specifically, KeepsHighBitrateWhenReconfiguringSender and MinVideoAndAudioBitrate. TBR=stefan@webrtc.org Bug: webrtc:8878 Change-Id: I7c3f110dec199ffc4226b24fea404ee205932940 Reviewed-on: https://webrtc-review.googlesource.com/54620 Reviewed-by: Taylor Brandstetter Cr-Commit-Position: refs/heads/master@{#22060} --- call/call_perf_tests.cc | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/call/call_perf_tests.cc b/call/call_perf_tests.cc index e9747a4fe6..ddeaf127c9 100644 --- a/call/call_perf_tests.cc +++ b/call/call_perf_tests.cc @@ -647,7 +647,15 @@ TEST_F(CallPerfTest, NoPadWithoutMinTransmitBitrate) { TestMinTransmitBitrate(false); } -TEST_F(CallPerfTest, KeepsHighBitrateWhenReconfiguringSender) { +// TODO(bugs.webrtc.org/8878) +#if defined(WEBRTC_MAC) +#define MAYBE_KeepsHighBitrateWhenReconfiguringSender \ + DISABLED_KeepsHighBitrateWhenReconfiguringSender +#else +#define MAYBE_KeepsHighBitrateWhenReconfiguringSender \ + KeepsHighBitrateWhenReconfiguringSender +#endif +TEST_F(CallPerfTest, MAYBE_KeepsHighBitrateWhenReconfiguringSender) { static const uint32_t kInitialBitrateKbps = 400; static const uint32_t kReconfigureThresholdKbps = 600; static const uint32_t kPermittedReconfiguredBitrateDiffKbps = 100; @@ -926,7 +934,15 @@ void CallPerfTest::TestMinAudioVideoBitrate( RunBaseTest(&test); } -TEST_F(CallPerfTest, MinVideoAndAudioBitrate) { +// TODO(bugs.webrtc.org/8878) +#if defined(WEBRTC_MAC) +#define MAYBE_MinVideoAndAudioBitrate \ + DISABLED_MinVideoAndAudioBitrate +#else +#define MAYBE_MinVideoAndAudioBitrate \ + MinVideoAndAudioBitrate +#endif +TEST_F(CallPerfTest, MAYBE_MinVideoAndAudioBitrate) { TestMinAudioVideoBitrate(false, 110, 40, -10, 10000, 70000, 200000); } TEST_F(CallPerfTest, MinVideoAndAudioBitrateWStrategy) {