| commit | 73e1a8bb741e8e3956815f75b4977c99f0bba0db | [log] [tgz] |
|---|---|---|
| author | pbos@webrtc.org <pbos@webrtc.org> | Mon Apr 28 08:49:07 2014 +0000 |
| committer | pbos@webrtc.org <pbos@webrtc.org> | Mon Apr 28 08:49:07 2014 +0000 |
| tree | e22e7ca9bd459d9e36048898f2a48598b36e64a3 | |
| parent | abf78cc828d914ecab42540d16ee4f082b940be8 [diff] |
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/webrtc@5991 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/video_engine/test/auto_test/automated/vie_extended_integration_test.cc b/video_engine/test/auto_test/automated/vie_extended_integration_test.cc index 01d92d1..e43fc75 100644 --- a/video_engine/test/auto_test/automated/vie_extended_integration_test.cc +++ b/video_engine/test/auto_test/automated/vie_extended_integration_test.cc
@@ -53,7 +53,7 @@ } TEST_F(DISABLED_ON_MAC(ViEExtendedIntegrationTest), - RunsRtpRtcpTestWithoutErrors) { + DISABLED_RunsRtpRtcpTestWithoutErrors) { tests_->ViERtpRtcpExtendedTest(); }
diff --git a/video_engine/test/auto_test/automated/vie_standard_integration_test.cc b/video_engine/test/auto_test/automated/vie_standard_integration_test.cc index 51208ba..584f9e9 100644 --- a/video_engine/test/auto_test/automated/vie_standard_integration_test.cc +++ b/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
@@ -51,13 +51,8 @@ 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(); }