Disabled EndToEndTest.{ReceivesFlexfec, ReceivesFlexfecAndSendsCorrespondingRtcp, CanReceiveUlpfec}…

webrtc/video/end_to_end_tests.cc

Index: webrtc/video/end_to_end_tests.cc
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index de92f83a9c21c04ee8a42f4fbcc596b4b7c6b761..f85ba06a0186897075842cc43aa5dd873952e77a 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<VideoFrame> {
    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);
 }