zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not rely on specific ordering on generated candidates in TestGetAllPortsPortRange

Browse Source 
This fixes another WebRTC swarming tests.

BUG=webrtc:6500

Review-Url: https://codereview.webrtc.org/2450983002
Cr-Commit-Position: refs/heads/master@{#14804}
This commit is contained in:
honghaiz
2016-10-27 11:44:17 -07:00
committed by Commit bot
parent 45d18eb034
commit a73df559d6
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/p2p/client/basicportallocator_unittest.cc
View File

@ -920,15 +920,19 @@ TEST_F(BasicPortAllocatorTest, TestGetAllPortsPortRange) {
session_->StartGettingPorts(); session_->StartGettingPorts();
ASSERT_EQ_WAIT(7U, candidates_.size(), kDefaultAllocationTimeout); ASSERT_EQ_WAIT(7U, candidates_.size(), kDefaultAllocationTimeout);
EXPECT_EQ(4U, ports_.size()); EXPECT_EQ(4U, ports_.size());
// Check the port number for the UDP port object.
EXPECT_PRED3(CheckPort, candidates_[0].address(), kMinPort, kMaxPort); int num_nonrelay_candidates = 0;
// Check the port number for the STUN port object. for (const Candidate& candidate : candidates_) {
EXPECT_PRED3(CheckPort, candidates_[1].address(), kMinPort, kMaxPort); // Check the port number for the UDP/STUN/TCP port objects.
if (candidate.type() != RELAY_PORT_TYPE) {
EXPECT_PRED3(CheckPort, candidate.address(), kMinPort, kMaxPort);
++num_nonrelay_candidates;
}
}
EXPECT_EQ(3, num_nonrelay_candidates);
// Check the port number used to connect to the relay server. // Check the port number used to connect to the relay server.
EXPECT_PRED3(CheckPort, relay_server_.GetConnection(0).source(), kMinPort, EXPECT_PRED3(CheckPort, relay_server_.GetConnection(0).source(), kMinPort,
kMaxPort); kMaxPort);
// Check the port number for the TCP port object.
EXPECT_PRED3(CheckPort, candidates_[5].address(), kMinPort, kMaxPort);
EXPECT_TRUE(candidate_allocation_done_); EXPECT_TRUE(candidate_allocation_done_);
} }