generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 69589535-> 69600065

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6504 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-06-20 04:42:34 +00:00
parent 58e7c8660c
commit 4c25c67146
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
talk/p2p/client/basicportallocator.cc
View File

@ -398,8 +398,6 @@ void BasicPortAllocatorSession::OnAllocate() {
DoAllocate();
allocation_started_ = true;
if (running_)
network_thread_->PostDelayed(ALLOCATE_DELAY, this, MSG_ALLOCATE);
}
// For each network, see if we have a sequence that covers it already. If not,

13
talk/p2p/client/portallocator_unittest.cc
View File

@ -280,6 +280,19 @@ TEST_F(PortAllocatorTest, TestBasic) {
EXPECT_TRUE(CreateSession(cricket::ICE_CANDIDATE_COMPONENT_RTP));
}
// Tests that we allocator session not trying to allocate ports for every 250ms.
TEST_F(PortAllocatorTest, TestNoNetworkInterface) {
EXPECT_TRUE(CreateSession(cricket::ICE_CANDIDATE_COMPONENT_RTP));
session_->StartGettingPorts();
// Waiting for one second to make sure BasicPortAllocatorSession has not
// called OnAllocate multiple times. In old behavior it's called every 250ms.
// When there are no network interfaces, each execution of OnAllocate will
// result in SignalCandidatesAllocationDone signal.
talk_base::Thread::Current()->ProcessMessages(1000);
EXPECT_TRUE(candidate_allocation_done_);
EXPECT_EQ(0U, candidates_.size());
}
// Tests that we can get all the desired addresses successfully.
TEST_F(PortAllocatorTest, TestGetAllPortsWithMinimumStepDelay) {
AddInterface(kClientAddr);