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
This commit is contained in:
pbos@webrtc.org 2014-04-28 08:49:07 +00:00
parent 12a34247a4
commit 69e9950469
2 changed files with 3 additions and 8 deletions

View File

@ -53,7 +53,7 @@ TEST_F(DISABLED_ON_MAC(ViEExtendedIntegrationTest),
} }
TEST_F(DISABLED_ON_MAC(ViEExtendedIntegrationTest), TEST_F(DISABLED_ON_MAC(ViEExtendedIntegrationTest),
RunsRtpRtcpTestWithoutErrors) { DISABLED_RunsRtpRtcpTestWithoutErrors) {
tests_->ViERtpRtcpExtendedTest(); tests_->ViERtpRtcpExtendedTest();
} }

View File

@ -51,13 +51,8 @@ TEST_F(ViEStandardIntegrationTest, RunsRenderTestWithoutErrors) {
tests_->ViERenderStandardTest(); tests_->ViERenderStandardTest();
} }
// Fails on Mac, see https://code.google.com/p/webrtc/issues/detail?id=1790 // Flaky, see webrtc:1790.
#if defined(WEBRTC_MAC) TEST_F(ViEStandardIntegrationTest, DISABLED_RunsRtpRtcpTestWithoutErrors) {
#define MAYBE_RunsRtpRtcpTestWithoutErrors DISABLED_RunsRtpRtcpTestWithoutErrors
#else
#define MAYBE_RunsRtpRtcpTestWithoutErrors RunsRtpRtcpTestWithoutErrors
#endif
TEST_F(ViEStandardIntegrationTest, MAYBE_RunsRtpRtcpTestWithoutErrors) {
tests_->ViERtpRtcpStandardTest(); tests_->ViERtpRtcpStandardTest();
} }