From 1086ed6469c0ce13ad059372c42cd28247034ed3 Mon Sep 17 00:00:00 2001 From: deadbeef Date: Fri, 22 Apr 2016 10:52:40 -0700 Subject: [PATCH] Disable SwitchesToASTThenBackToTOFForVideo test completely. It's flaky not only for ASan/MSan, but regular Windows/Linux bots. NOTRY=True BUG=webrtc:5790 Review URL: https://codereview.webrtc.org/1908663002 Cr-Commit-Position: refs/heads/master@{#12475} --- webrtc/call/bitrate_estimator_tests.cc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/webrtc/call/bitrate_estimator_tests.cc b/webrtc/call/bitrate_estimator_tests.cc index 2aa2b84acd..122e5bb19b 100644 --- a/webrtc/call/bitrate_estimator_tests.cc +++ b/webrtc/call/bitrate_estimator_tests.cc @@ -302,15 +302,8 @@ TEST_F(BitrateEstimatorTest, SwitchesToASTForVideo) { EXPECT_TRUE(receiver_log_.Wait()); } -// Fails when run with ASan/MSan. See webrtc:5790. -#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) -#define MAYBE_SwitchesToASTThenBackToTOFForVideo \ - DISABLED_SwitchesToASTThenBackToTOFForVideo -#else -#define MAYBE_SwitchesToASTThenBackToTOFForVideo \ - SwitchesToASTThenBackToTOFForVideo -#endif -TEST_F(BitrateEstimatorTest, MAYBE_SwitchesToASTThenBackToTOFForVideo) { +// This test is flaky. See webrtc:5790. +TEST_F(BitrateEstimatorTest, DISABLED_SwitchesToASTThenBackToTOFForVideo) { video_send_config_.rtp.extensions.push_back( RtpExtension(RtpExtension::kTOffset, kTOFExtensionId)); receiver_log_.PushExpectedLogLine(kSingleStreamLog);