From 69e99504699419b2a5ab9c709923bbb95239f343 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Mon, 28 Apr 2014 08:49:07 +0000 Subject: [PATCH] Disable flaky RunsRtpRtcpTestWIthoutErrors. BUG=1790 TBR=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/16389004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5991 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../auto_test/automated/vie_extended_integration_test.cc | 2 +- .../auto_test/automated/vie_standard_integration_test.cc | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc index 01d92d1c0a..e43fc751b0 100644 --- a/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc +++ b/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc @@ -53,7 +53,7 @@ TEST_F(DISABLED_ON_MAC(ViEExtendedIntegrationTest), } TEST_F(DISABLED_ON_MAC(ViEExtendedIntegrationTest), - RunsRtpRtcpTestWithoutErrors) { + DISABLED_RunsRtpRtcpTestWithoutErrors) { tests_->ViERtpRtcpExtendedTest(); } diff --git a/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc index 51208bade0..584f9e92ff 100644 --- a/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc +++ b/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc @@ -51,13 +51,8 @@ TEST_F(ViEStandardIntegrationTest, RunsRenderTestWithoutErrors) { tests_->ViERenderStandardTest(); } -// Fails on Mac, see https://code.google.com/p/webrtc/issues/detail?id=1790 -#if defined(WEBRTC_MAC) -#define MAYBE_RunsRtpRtcpTestWithoutErrors DISABLED_RunsRtpRtcpTestWithoutErrors -#else -#define MAYBE_RunsRtpRtcpTestWithoutErrors RunsRtpRtcpTestWithoutErrors -#endif -TEST_F(ViEStandardIntegrationTest, MAYBE_RunsRtpRtcpTestWithoutErrors) { +// Flaky, see webrtc:1790. +TEST_F(ViEStandardIntegrationTest, DISABLED_RunsRtpRtcpTestWithoutErrors) { tests_->ViERtpRtcpStandardTest(); }