Disabled several JsepPeerConnectionP2PTestClient tests on Mac, due to flakiness on Debug Mac trybot…

talk/app/webrtc/peerconnection_unittest.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 1141 matching lines @@
   FakeConstraints setup_constraints;
   setup_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp,
                                  true);
   ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints));
   receiving_client()->SetReceiveAudioVideo(true, false);
   LocalP2PTest();
   receiving_client()->SetReceiveAudioVideo(true, true);
   receiving_client()->Negotiate();
 }
 
+// Flaky on Mac Debug bots. See webrtc:5231
+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
+#define MAYBE_LocalP2PTestOfferDtlsButNotSdes \
+  DISABLED_LocalP2PTestOfferDtlsButNotSdes
+#else
+#define MAYBE_LocalP2PTestOfferDtlsButNotSdes LocalP2PTestOfferDtlsButNotSdes
+#endif
+
 // This test sets up a call between two endpoints that are configured to use
 // DTLS key agreement. The offerer don't support SDES. As a result, DTLS is
 // negotiated and used for transport.
-TEST_F(JsepPeerConnectionP2PTestClient, LocalP2PTestOfferDtlsButNotSdes) {
+TEST_F(JsepPeerConnectionP2PTestClient, MAYBE_LocalP2PTestOfferDtlsButNotSdes) {
   MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp);
   FakeConstraints setup_constraints;
   setup_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp,
                                  true);
   ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints));
   receiving_client()->RemoveSdesCryptoFromReceivedSdp(true);
   LocalP2PTest();
   VerifyRenderedSize(640, 480);
 }
 
@@ skipping 57 matching lines @@
   FakeConstraints constraint;
   constraint.SetOptionalMaxWidth(320);
   SetVideoConstraints(constraint, constraint);
   initializing_client()->AddMediaStream(true, true);
   initializing_client()->AddMediaStream(false, true);
   ASSERT_EQ(2u, initializing_client()->NumberOfLocalMediaStreams());
   LocalP2PTest();
   EXPECT_EQ(2u, receiving_client()->number_of_remote_streams());
 }
 
+// Flaky on Mac Debug bots. See webrtc:5231
+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
+#define MAYBE_GetAudioOutputLevelStats DISABLED_GetAudioOutputLevelStats
+#else
+#define MAYBE_GetAudioOutputLevelStats GetAudioOutputLevelStats
+#endif
+
 // Test that we can receive the audio output level from a remote audio track.
-TEST_F(JsepPeerConnectionP2PTestClient, GetAudioOutputLevelStats) {
+TEST_F(JsepPeerConnectionP2PTestClient, MAYBE_GetAudioOutputLevelStats) {
   ASSERT_TRUE(CreateTestClients());
   LocalP2PTest();
 
   StreamCollectionInterface* remote_streams =
       initializing_client()->remote_streams();
   ASSERT_GT(remote_streams->count(), 0u);
   ASSERT_GT(remote_streams->at(0)->GetAudioTracks().size(), 0u);
   MediaStreamTrackInterface* remote_audio_track =
       remote_streams->at(0)->GetAudioTracks()[0];
 
   // Get the audio output level stats. Note that the level is not available
   // until a RTCP packet has been received.
   EXPECT_TRUE_WAIT(
       initializing_client()->GetAudioOutputLevelStats(remote_audio_track) > 0,
       kMaxWaitForStatsMs);
 }
 
+// Flaky on Mac Debug bots. See webrtc:5231
+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
+#define MAYBE_GetAudioInputLevelStats DISABLED_GetAudioInputLevelStats
+#else
+#define MAYBE_GetAudioInputLevelStats GetAudioInputLevelStats
+#endif
+
 // Test that an audio input level is reported.
-TEST_F(JsepPeerConnectionP2PTestClient, GetAudioInputLevelStats) {
+TEST_F(JsepPeerConnectionP2PTestClient, MAYBE_GetAudioInputLevelStats) {
   ASSERT_TRUE(CreateTestClients());
   LocalP2PTest();
 
   // Get the audio input level stats.  The level should be available very
   // soon after the test starts.
   EXPECT_TRUE_WAIT(initializing_client()->GetAudioInputLevelStats() > 0,
       kMaxWaitForStatsMs);
 }
 
+// Flaky on Mac Debug bots. See webrtc:5231
+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
+#define MAYBE_GetBytesReceivedStats DISABLED_GetBytesReceivedStats
+#else
+#define MAYBE_GetBytesReceivedStats GetBytesReceivedStats
+#endif
+
 // Test that we can get incoming byte counts from both audio and video tracks.
-TEST_F(JsepPeerConnectionP2PTestClient, GetBytesReceivedStats) {
+TEST_F(JsepPeerConnectionP2PTestClient, MAYBE_GetBytesReceivedStats) {
   ASSERT_TRUE(CreateTestClients());
   LocalP2PTest();
 
   StreamCollectionInterface* remote_streams =
       initializing_client()->remote_streams();
   ASSERT_GT(remote_streams->count(), 0u);
   ASSERT_GT(remote_streams->at(0)->GetAudioTracks().size(), 0u);
   MediaStreamTrackInterface* remote_audio_track =
       remote_streams->at(0)->GetAudioTracks()[0];
   EXPECT_TRUE_WAIT(
       initializing_client()->GetBytesReceivedStats(remote_audio_track) > 0,
       kMaxWaitForStatsMs);
 
   MediaStreamTrackInterface* remote_video_track =
       remote_streams->at(0)->GetVideoTracks()[0];
   EXPECT_TRUE_WAIT(
       initializing_client()->GetBytesReceivedStats(remote_video_track) > 0,
       kMaxWaitForStatsMs);
 }
 
+// Flaky on Mac Debug bots. See webrtc:5231
+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
+#define MAYBE_GetBytesSentStats DISABLED_GetBytesSentStats
+#else
+#define MAYBE_GetBytesSentStats GetBytesSentStats
+#endif
+
 // Test that we can get outgoing byte counts from both audio and video tracks.
-TEST_F(JsepPeerConnectionP2PTestClient, GetBytesSentStats) {
+TEST_F(JsepPeerConnectionP2PTestClient, MAYBE_GetBytesSentStats) {
   ASSERT_TRUE(CreateTestClients());
   LocalP2PTest();
 
   StreamCollectionInterface* local_streams =
       initializing_client()->local_streams();
   ASSERT_GT(local_streams->count(), 0u);
   ASSERT_GT(local_streams->at(0)->GetAudioTracks().size(), 0u);
   MediaStreamTrackInterface* local_audio_track =
       local_streams->at(0)->GetAudioTracks()[0];
   EXPECT_TRUE_WAIT(
@@ skipping 31 matching lines @@
                        rtc::SSL_PROTOCOL_DTLS_10, rtc::KT_DEFAULT)));
 
   EXPECT_EQ_WAIT(rtc::SrtpCryptoSuiteToName(kDefaultSrtpCryptoSuite),
                  initializing_client()->GetSrtpCipherStats(),
                  kMaxWaitForStatsMs);
   EXPECT_EQ(1,
             init_observer->GetEnumCounter(webrtc::kEnumCounterAudioSrtpCipher,
                                           kDefaultSrtpCryptoSuite));
 }
 
+// Flaky on Mac Debug bots. See webrtc:5231
+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
+#define MAYBE_GetDtls12Both DISABLED_GetDtls12Both
+#else
+#define MAYBE_GetDtls12Both GetDtls12Both
+#endif
+
 // Test that DTLS 1.2 is used if both ends support it.
-TEST_F(JsepPeerConnectionP2PTestClient, GetDtls12Both) {
+TEST_F(JsepPeerConnectionP2PTestClient, MAYBE_GetDtls12Both) {
   PeerConnectionFactory::Options init_options;
   init_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_12;
   PeerConnectionFactory::Options recv_options;
   recv_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_12;
   ASSERT_TRUE(
       CreateTestClients(nullptr, &init_options, nullptr, &recv_options));
   rtc::scoped_refptr<webrtc::FakeMetricsObserver>
       init_observer = new rtc::RefCountedObject<webrtc::FakeMetricsObserver>();
   initializing_client()->pc()->RegisterUMAObserver(init_observer);
   LocalP2PTest();
@@ skipping 190 matching lines @@
   MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp);
   FakeConstraints constraints;
   constraints.SetMandatory(
       MediaConstraintsInterface::kEnableDtlsSrtp, true);
   ASSERT_TRUE(CreateTestClients(&constraints, &constraints));
   initializing_client()->CreateDataChannel();
   initializing_client()->Negotiate(false, false);
 }
 #endif
 
+// Flaky on Mac Debug bots. See webrtc:5231
+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
+#define MAYBE_IceRestart DISABLED_IceRestart
+#else
+#define MAYBE_IceRestart IceRestart
+#endif
+
 // This test sets up a call between two parties with audio, and video.
 // During the call, the initializing side restart ice and the test verifies that
 // new ice candidates are generated and audio and video still can flow.
-TEST_F(JsepPeerConnectionP2PTestClient, IceRestart) {
+TEST_F(JsepPeerConnectionP2PTestClient, MAYBE_IceRestart) {
   ASSERT_TRUE(CreateTestClients());
 
   // Negotiate and wait for ice completion and make sure audio and video plays.
   LocalP2PTest();
 
   // Create a SDP string of the first audio candidate for both clients.
   const webrtc::IceCandidateCollection* audio_candidates_initiator =
       initializing_client()->pc()->local_description()->candidates(0);
   const webrtc::IceCandidateCollection* audio_candidates_receiver =
       receiving_client()->pc()->local_description()->candidates(0);
@@ skipping 237 matching lines @@
   server.urls.push_back("stun:hostname");
   server.urls.push_back("turn:hostname");
   servers.push_back(server);
   EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_configurations_,
                                       &turn_configurations_));
   EXPECT_EQ(1U, stun_configurations_.size());
   EXPECT_EQ(1U, turn_configurations_.size());
 }
 
 #endif // if !defined(THREAD_SANITIZER)