From 327c450f99ef2f219094c040d660e2d0f653c9a7 Mon Sep 17 00:00:00 2001 From: aleloi Date: Thu, 26 Jan 2017 01:43:56 -0800 Subject: [PATCH] Disabled EndToEndTest.{ReceivesFlexfec, ReceivesFlexfecAndSendsCorrespondingRtcp, CanReceiveUlpfec} due to breakages across several platforms. Removed conditional disabling of ReceivesFlexfecAndSendsCorrespondingRtcp on Asan, since failure occurs at other platforms as well. BUG=webrtc:7050 TBR=holmer@webrtc.org NOTRY=True Review-Url: https://codereview.webrtc.org/2651673011 Cr-Commit-Position: refs/heads/master@{#16288} --- webrtc/video/end_to_end_tests.cc | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc index de92f83a9c..f85ba06a01 100644 --- a/webrtc/video/end_to_end_tests.cc +++ b/webrtc/video/end_to_end_tests.cc @@ -58,16 +58,6 @@ namespace webrtc { -// Disable for Asan due to timeout, see bugs.webrtc.org/7047 for -// details. -#if defined(ADDRESS_SANITIZER) -#define MAYBE_ReceivesFlexfecAndSendsCorrespondingRtcp \ - DISABLED_ReceivesFlexfecAndSendsCorrespondingRtcp -#else -#define MAYBE_ReceivesFlexfecAndSendsCorrespondingRtcp \ - ReceivesFlexfecAndSendsCorrespondingRtcp -#endif - namespace { const char new_jb_enabled[] = "WebRTC-NewVideoJitterBuffer/Enabled/"; const char new_jb_disabled[] = "WebRTC-NewVideoJitterBuffer/Disabled/"; @@ -613,7 +603,9 @@ TEST_P(EndToEndTest, ReceivesNackAndRetransmitsAudio) { RunBaseTest(&test); } -TEST_P(EndToEndTest, CanReceiveUlpfec) { +// Disable due to failure, see bugs.webrtc.org/7050 for +// details. +TEST_P(EndToEndTest, DISABLED_CanReceiveUlpfec) { class UlpfecRenderObserver : public test::EndToEndTest, public rtc::VideoSinkInterface { public: @@ -829,12 +821,16 @@ class FlexfecRenderObserver : public test::EndToEndTest, Random random_; }; -TEST_P(EndToEndTest, ReceivesFlexfec) { +// Disable due to failure, see bugs.webrtc.org/7050 for +// details. +TEST_P(EndToEndTest, DISABLED_ReceivesFlexfec) { FlexfecRenderObserver test(false); RunBaseTest(&test); } -TEST_P(EndToEndTest, MAYBE_ReceivesFlexfecAndSendsCorrespondingRtcp) { +// Disable due to failure, see bugs.webrtc.org/7050 for +// details. +TEST_P(EndToEndTest, DISABLED_ReceivesFlexfecAndSendsCorrespondingRtcp) { FlexfecRenderObserver test(true); RunBaseTest(&test); }