admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increasing timeout for TestResolverShutdown.

Browse Source 
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}
This commit is contained in:
Taylor Brandstetter 2015-12-29 12:51:12 -08:00
parent 355113a702
commit e86e15b2a2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/p2p/base/turnport_unittest.cc
View File

@ -975,6 +975,10 @@ TEST_F(TurnPortTest, DISABLED_TestTurnTCPReleaseAllocation) {
// 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 @@ TEST_F(TurnPortTest, TestResolverShutdown) {
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);