From 799467d753e999e30249028c6a3a18e95684c4bc Mon Sep 17 00:00:00 2001 From: ossu Date: Tue, 31 May 2016 05:17:32 -0700 Subject: [PATCH] Disabled RestartingSendStreamPreservesRtpStatesWithRtx on Mac due to flakiness. I have not seen it crop up on other platforms, so limiting the disable to just Mac for now. See, for example: https://build.chromium.org/p/client.webrtc/builders/Mac64%20Debug/builds/7339/steps/video_engine_tests/logs/stdio BUG=webrtc:4332 Review-Url: https://codereview.webrtc.org/2027573002 Cr-Commit-Position: refs/heads/master@{#12973} --- webrtc/video/end_to_end_tests.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc index 2dea36f146..36d1cd184a 100644 --- a/webrtc/video/end_to_end_tests.cc +++ b/webrtc/video/end_to_end_tests.cc @@ -3080,7 +3080,14 @@ TEST_F(EndToEndTest, RestartingSendStreamPreservesRtpState) { TestRtpStatePreservation(false); } -TEST_F(EndToEndTest, RestartingSendStreamPreservesRtpStatesWithRtx) { +#if defined(WEBRTC_MAC) +#define MAYBE_RestartingSendStreamPreservesRtpStatesWithRtx \ + DISABLED_RestartingSendStreamPreservesRtpStatesWithRtx +#else +#define MAYBE_RestartingSendStreamPreservesRtpStatesWithRtx \ + RestartingSendStreamPreservesRtpStatesWithRtx +#endif +TEST_F(EndToEndTest, MAYBE_RestartingSendStreamPreservesRtpStatesWithRtx) { TestRtpStatePreservation(true); }