commit e86e15b2a2ee208e2d8edbb1c2d73274d9b8aec7
author Taylor Brandstetter <deadbeef@webrtc.org> Tue Dec 29 20:51:12 2015
committer Taylor Brandstetter <deadbeef@webrtc.org> Tue Dec 29 20:51:21 2015
tree 27d82255fd97ac973f347dbb48f74e2b2310d9d7
parent 355113a7029c6b5edd8628f31538c4a17dffac0d

Increasing timeout for TestResolverShutdown.

getaddrinfo() seems to take longer than a second occasionally.

BUG=webrtc:5191
R=pthatcher@webrtc.org

Review URL: https://codereview.webrtc.org/1536563005 .

Cr-Commit-Position: refs/heads/master@{#11138}

webrtc/p2p/base/turnport_unittest.cc

diff --git a/webrtc/p2p/base/turnport_unittest.cc b/webrtc/p2p/base/turnport_unittest.cc
index 5720748..eac3474 100644
--- a/webrtc/p2p/base/turnport_unittest.cc
+++ b/webrtc/p2p/base/turnport_unittest.cc
@@ -975,6 +975,10 @@
 // This test verifies any FD's are not leaked after TurnPort is destroyed.
 // https://code.google.com/p/webrtc/issues/detail?id=2651
 #if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
+// 1 second is not always enough for getaddrinfo().
+// See: https://bugs.chromium.org/p/webrtc/issues/detail?id=5191
+static const unsigned int kResolverTimeout = 10000;
+
 TEST_F(TurnPortTest, TestResolverShutdown) {
   turn_server_.AddInternalSocket(kTurnUdpIPv6IntAddr, cricket::PROTO_UDP);
   int last_fd_count = GetFDCount();
@@ -983,7 +987,7 @@
                  cricket::ProtocolAddress(rtc::SocketAddress(
                     "www.google.invalid", 3478), cricket::PROTO_UDP));
   turn_port_->PrepareAddress();
-  ASSERT_TRUE_WAIT(turn_error_, kTimeout);
+  ASSERT_TRUE_WAIT(turn_error_, kResolverTimeout);
   EXPECT_TRUE(turn_port_->Candidates().empty());
   turn_port_.reset();
   rtc::Thread::Current()->Post(this, MSG_TESTFINISH);