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

Increasing STUN timeout for some more tests.

Browse Source 
A 500ms margin of error from STUN timeout to test timeout is not
enough for some buildbots.

TBR=pthatcher@webrtc.org
NOTRY=True

Review-Url: https://codereview.webrtc.org/2015763004
Cr-Commit-Position: refs/heads/master@{#12932}
This commit is contained in:
deadbeef 2016-05-26 14:34:09 -07:00 committed by Commit bot
parent 0ad72ead67
commit 4c2db414be
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/p2p/base/relayport_unittest.cc
View File

@ -152,8 +152,11 @@ class RelayPortTest : public testing::Test,
EXPECT_FALSE(relay_port_->IsReady());
// Should have timed out in 200 + 200 + 400 + 800 + 1600 ms.
EXPECT_TRUE_WAIT(HasFailed(&fake_protocol_address), 3600);
// Should have timed out in 200 + 200 + 400 + 800 + 1600 ms = 3200ms.
// Add some margin of error for slow bots.
// TODO(deadbeef): Use simulated clock instead of just increasing timeouts
// to fix flaky tests.
EXPECT_TRUE_WAIT(HasFailed(&fake_protocol_address), 5000);
// Wait until relayport is ready.
EXPECT_TRUE_WAIT(relay_port_->IsReady(), kMaxTimeoutMs);

8
webrtc/p2p/base/stunrequest_unittest.cc
View File

@ -17,6 +17,12 @@
using namespace cricket;
// STUN timeout (with all retries) is 9500ms.
// Add some margin of error for slow bots.
// TODO(deadbeef): Use simulated clock instead of just increasing timeouts to
// fix flaky tests.
static const int kTimeoutMs = 15000;
class StunRequestTest : public testing::Test,
public sigslot::has_slots<> {
public:
@ -172,7 +178,7 @@ TEST_F(StunRequestTest, TestTimeout) {
StunMessage* res = CreateStunMessage(STUN_BINDING_RESPONSE, req);
manager_.Send(new StunRequestThunker(req, this));
rtc::Thread::Current()->ProcessMessages(10000); // > STUN timeout
rtc::Thread::Current()->ProcessMessages(kTimeoutMs);
EXPECT_FALSE(manager_.CheckResponse(res));
EXPECT_TRUE(response_ == NULL);