Relaxing timeouts for TestMediaMonitor.

webrtc/pc/channel_unittest.cc

 /*
  *  Copyright 2009 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 32 matching lines @@
 const cricket::AudioCodec kIsacCodec(103, "ISAC", 40000, 16000, 1);
 const cricket::VideoCodec kH264Codec(97, "H264");
 const cricket::VideoCodec kH264SvcCodec(99, "H264-SVC");
 const cricket::DataCodec kGoogleDataCodec(101, "google-data");
 const uint32_t kSsrc1 = 0x1111;
 const uint32_t kSsrc2 = 0x2222;
 const uint32_t kSsrc3 = 0x3333;
 const int kAudioPts[] = {0, 8};
 const int kVideoPts[] = {97, 99};
 enum class NetworkIsWorker { Yes, No };
+const int kDefaultTimeout = 10000;  // 10 seconds.
 }  // namespace
 
 template <class ChannelT,
           class MediaChannelT,
           class ContentT,
           class CodecT,
           class MediaInfoT,
           class OptionsT>
 class Traits {
  public:
@@ skipping 1525 matching lines @@
     EXPECT_TRUE(CheckNoRtcp2());
 
     SendCustomRtcp1(kSsrc2);
     SendCustomRtcp2(kSsrc1);
     WaitForThreads();
     // Bundle filter shouldn't filter out any RTCP.
     EXPECT_TRUE(CheckCustomRtcp1(kSsrc1));
     EXPECT_TRUE(CheckCustomRtcp2(kSsrc2));
   }
 
-  // Test that the media monitor can be run and gives timely callbacks.
+  // Test that the media monitor can be run and gives callbacks.
   void TestMediaMonitor() {
-    static const int kTimeout = 500;
     CreateChannels(0, 0);
     EXPECT_TRUE(SendInitiate());
     EXPECT_TRUE(SendAccept());
     channel1_->StartMediaMonitor(100);
     channel2_->StartMediaMonitor(100);
     // Ensure we get callbacks and stop.
-    EXPECT_TRUE_WAIT(media_info_callbacks1_ > 0, kTimeout);
-    EXPECT_TRUE_WAIT(media_info_callbacks2_ > 0, kTimeout);
+    EXPECT_TRUE_WAIT(media_info_callbacks1_ > 0, kDefaultTimeout);
+    EXPECT_TRUE_WAIT(media_info_callbacks2_ > 0, kDefaultTimeout);
     channel1_->StopMediaMonitor();
     channel2_->StopMediaMonitor();
     // Ensure a restart of a stopped monitor works.
     channel1_->StartMediaMonitor(100);
-    EXPECT_TRUE_WAIT(media_info_callbacks1_ > 0, kTimeout);
+    EXPECT_TRUE_WAIT(media_info_callbacks1_ > 0, kDefaultTimeout);
     channel1_->StopMediaMonitor();
     // Ensure stopping a stopped monitor is OK.
     channel1_->StopMediaMonitor();
   }
 
   void TestSetContentFailure() {
     CreateChannels(0, 0);
 
     auto sdesc = cricket::SessionDescription();
     sdesc.AddContent(cricket::CN_AUDIO, cricket::NS_JINGLE_RTP,
@@ skipping 2054 matching lines @@
   };
   rtc::CopyOnWriteBuffer payload(data, 3);
   cricket::SendDataResult result;
   ASSERT_TRUE(media_channel1_->SendData(params, payload, &result));
   EXPECT_EQ(params.ssrc,
             media_channel1_->last_sent_data_params().ssrc);
   EXPECT_EQ("foo", media_channel1_->last_sent_data());
 }
 
 // TODO(pthatcher): TestSetReceiver?