From b7d24f6d8d79c85e1989468412b04d74816b9bd6 Mon Sep 17 00:00:00 2001
From: kjellander <kjellander@webrtc.org>
Date: Sun, 26 Feb 2017 22:10:14 -0800
Subject: [PATCH] Disable flaky tests on iOS

Tests disabled:
CurrentSpeakerMonitorTest.SpeakerChange
TargetDelayTest.OutOfRangeInput
TargetDelayTest.NoTargetDelayBufferSizeChanges
TargetDelayTest.WithTargetDelayBufferNotChanging
TargetDelayTest.RequiredDelayAtCorrectRange
TargetDelayTest.TargetDelayBufferMinMax

BUG=webrtc:7057
TBR=aleloi@webrtc.org
NOTRY=True

Review-Url: https://codereview.webrtc.org/2717993002
Cr-Commit-Position: refs/heads/master@{#16850}
---
 .../audio_coding/test/target_delay_unittest.cc    | 15 ++++++++++-----
 webrtc/pc/currentspeakermonitor_unittest.cc       |  8 +++++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/webrtc/modules/audio_coding/test/target_delay_unittest.cc b/webrtc/modules/audio_coding/test/target_delay_unittest.cc
index 1b400262ae..9d1ce66365 100644
--- a/webrtc/modules/audio_coding/test/target_delay_unittest.cc
+++ b/webrtc/modules/audio_coding/test/target_delay_unittest.cc
@@ -201,7 +201,8 @@ class TargetDelayTest : public ::testing::Test {
   uint8_t payload_[kPayloadLenBytes];
 };
 
-#if defined(WEBRTC_ANDROID)
+// Flaky on iOS: webrtc:7057.
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
 #define MAYBE_OutOfRangeInput DISABLED_OutOfRangeInput
 #else
 #define MAYBE_OutOfRangeInput OutOfRangeInput
@@ -210,7 +211,8 @@ TEST_F(TargetDelayTest, MAYBE_OutOfRangeInput) {
   OutOfRangeInput();
 }
 
-#if defined(WEBRTC_ANDROID)
+// Flaky on iOS: webrtc:7057.
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
 #define MAYBE_NoTargetDelayBufferSizeChanges \
   DISABLED_NoTargetDelayBufferSizeChanges
 #else
@@ -220,7 +222,8 @@ TEST_F(TargetDelayTest, MAYBE_NoTargetDelayBufferSizeChanges) {
   NoTargetDelayBufferSizeChanges();
 }
 
-#if defined(WEBRTC_ANDROID)
+// Flaky on iOS: webrtc:7057.
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
 #define MAYBE_WithTargetDelayBufferNotChanging \
   DISABLED_WithTargetDelayBufferNotChanging
 #else
@@ -230,7 +233,8 @@ TEST_F(TargetDelayTest, MAYBE_WithTargetDelayBufferNotChanging) {
   WithTargetDelayBufferNotChanging();
 }
 
-#if defined(WEBRTC_ANDROID)
+// Flaky on iOS: webrtc:7057.
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
 #define MAYBE_RequiredDelayAtCorrectRange DISABLED_RequiredDelayAtCorrectRange
 #else
 #define MAYBE_RequiredDelayAtCorrectRange RequiredDelayAtCorrectRange
@@ -239,7 +243,8 @@ TEST_F(TargetDelayTest, MAYBE_RequiredDelayAtCorrectRange) {
   RequiredDelayAtCorrectRange();
 }
 
-#if defined(WEBRTC_ANDROID)
+// Flaky on iOS: webrtc:7057.
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
 #define MAYBE_TargetDelayBufferMinMax DISABLED_TargetDelayBufferMinMax
 #else
 #define MAYBE_TargetDelayBufferMinMax TargetDelayBufferMinMax
diff --git a/webrtc/pc/currentspeakermonitor_unittest.cc b/webrtc/pc/currentspeakermonitor_unittest.cc
index 85e4a7d1d7..a71f72ed8b 100644
--- a/webrtc/pc/currentspeakermonitor_unittest.cc
+++ b/webrtc/pc/currentspeakermonitor_unittest.cc
@@ -122,7 +122,13 @@ TEST_F(CurrentSpeakerMonitorTest, DISABLED_RapidSpeakerChange) {
   EXPECT_EQ(num_changes_, 1);
 }
 
-TEST_F(CurrentSpeakerMonitorTest, SpeakerChange) {
+// Flaky on iOS: webrtc:7057.
+#if defined(WEBRTC_IOS)
+#define MAYBE_SpeakerChange DISABLED_SpeakerChange
+#else
+#define MAYBE_SpeakerChange SpeakerChange
+#endif
+TEST_F(CurrentSpeakerMonitorTest, MAYBE_SpeakerChange) {
   AudioInfo info;
   InitAudioInfo(&info, 0, 0);