From f8475433be491a616bc08730a866c3f4dda4426d Mon Sep 17 00:00:00 2001 From: danilchap Date: Mon, 27 Feb 2017 09:21:14 -0800 Subject: [PATCH] Disable flaky ViEEncoderTest.NrOfDroppedFramesLimited BUG=webrtc:7232 NOTRY=true TBR=mflodman@webrtc.org Review-Url: https://codereview.webrtc.org/2720003002 Cr-Commit-Position: refs/heads/master@{#16876} --- webrtc/video/vie_encoder_unittest.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webrtc/video/vie_encoder_unittest.cc b/webrtc/video/vie_encoder_unittest.cc index faa48330aa..320f664840 100644 --- a/webrtc/video/vie_encoder_unittest.cc +++ b/webrtc/video/vie_encoder_unittest.cc @@ -1138,7 +1138,13 @@ TEST_F(ViEEncoderTest, DropsFramesAndScalesWhenBitrateIsTooLow) { vie_encoder_->Stop(); } -TEST_F(ViEEncoderTest, NrOfDroppedFramesLimited) { +#if defined(MEMORY_SANITIZER) +// Fails under MemorySanitizer: See http://crbug.com/webrtc/7232 +#define MAYBE_NrOfDroppedFramesLimited DISABLED_NrOfDroppedFramesLimited +#else +#define MAYBE_NrOfDroppedFramesLimited NrOfDroppedFramesLimited +#endif +TEST_F(ViEEncoderTest, MAYBE_NrOfDroppedFramesLimited) { // 1kbps. This can never be achieved. vie_encoder_->OnBitrateUpdated(1000, 0, 0); int frame_width = 640;