From 4aa438c91509cbfa9a240a66ea15f81c549d5525 Mon Sep 17 00:00:00 2001 From: minyuel Date: Fri, 15 Apr 2016 15:34:40 +0200 Subject: [PATCH] Suppress a flaky test: SwitchesToASTThenBackToTOFForVideo. BUG=webrtc:5790 R=pbos@webrtc.org, stefan@webrtc.org Review URL: https://codereview.webrtc.org/1883923005 . Cr-Commit-Position: refs/heads/master@{#12378} --- webrtc/call/bitrate_estimator_tests.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/webrtc/call/bitrate_estimator_tests.cc b/webrtc/call/bitrate_estimator_tests.cc index c63d45dc6e..4982fbfdad 100644 --- a/webrtc/call/bitrate_estimator_tests.cc +++ b/webrtc/call/bitrate_estimator_tests.cc @@ -302,7 +302,15 @@ TEST_F(BitrateEstimatorTest, SwitchesToASTForVideo) { EXPECT_TRUE(receiver_log_.Wait()); } -TEST_F(BitrateEstimatorTest, SwitchesToASTThenBackToTOFForVideo) { +// Fails when run with ASan. See webrtc:5790. +#if defined(ADDRESS_SANITIZER) +#define MAYBE_SwitchesToASTThenBackToTOFForVideo \ + DISABLED_SwitchesToASTThenBackToTOFForVideo +#else +#define MAYBE_SwitchesToASTThenBackToTOFForVideo \ + SwitchesToASTThenBackToTOFForVideo +#endif +TEST_F(BitrateEstimatorTest, MAYBE_SwitchesToASTThenBackToTOFForVideo) { video_send_config_.rtp.extensions.push_back( RtpExtension(RtpExtension::kTOffset, kTOFExtensionId)); receiver_log_.PushExpectedLogLine(kSingleStreamLog);