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

Removes the flakiness in PeerConnectionUsageHistogramTest.

Browse Source 
Bug: webrtc:9494, webrtc:11048
Change-Id: I5e6498f10259ee76af682d7019b89bf1f5bb9699
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/158760
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Qingsi Wang <qingsi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29659}
This commit is contained in:
Qingsi Wang
2019-10-30 16:03:46 -07:00
committed by Commit Bot
parent 5bd8cb74a6
commit 32913c128a
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pc/peer_connection_histogram_unittest.cc
View File

@ -167,15 +167,13 @@ class PeerConnectionWrapperForUsageHistogramTest
return static_cast<ObserverForUsageHistogramTest*>(observer()) return static_cast<ObserverForUsageHistogramTest*>(observer())
->HaveDataChannel(); ->HaveDataChannel();
} }
void AddOrBufferIceCandidate(const webrtc::IceCandidateInterface* candidate) { void BufferIceCandidate(const webrtc::IceCandidateInterface* candidate) {
if (!pc()->AddIceCandidate(candidate)) { std::string sdp;
std::string sdp; EXPECT_TRUE(candidate->ToString(&sdp));
EXPECT_TRUE(candidate->ToString(&sdp)); std::unique_ptr<webrtc::IceCandidateInterface> candidate_copy(
std::unique_ptr<webrtc::IceCandidateInterface> candidate_copy( CreateIceCandidate(candidate->sdp_mid(), candidate->sdp_mline_index(),
CreateIceCandidate(candidate->sdp_mid(), candidate->sdp_mline_index(), sdp, nullptr));
sdp, nullptr)); buffered_candidates_.push_back(std::move(candidate_copy));
buffered_candidates_.push_back(std::move(candidate_copy));
}
} }
void AddBufferedIceCandidates() { void AddBufferedIceCandidates() {
@ -185,11 +183,24 @@ class PeerConnectionWrapperForUsageHistogramTest
buffered_candidates_.clear(); buffered_candidates_.clear();
} }
// This method performs the following actions in sequence:
// 1. Exchange Offer and Answer.
// 2. Exchange ICE candidates after both caller and callee complete
// gathering.
// 3. Wait for ICE to connect.
//
// This guarantees a deterministic sequence of events and also rules out the
// occurrence of prflx candidates if the offer/answer signaling and the
// candidate trickling race in order. In case prflx candidates need to be
// simulated, see the approach used by tests below for that.
bool ConnectTo(PeerConnectionWrapperForUsageHistogramTest* callee) { bool ConnectTo(PeerConnectionWrapperForUsageHistogramTest* callee) {
PrepareToExchangeCandidates(callee); PrepareToExchangeCandidates(callee);
if (!ExchangeOfferAnswerWith(callee)) { if (!ExchangeOfferAnswerWith(callee)) {
return false; return false;
} }
// Wait until the gathering completes before we signal the candidate.
WAIT(observer()->ice_gathering_complete_, kDefaultTimeout);
WAIT(callee->observer()->ice_gathering_complete_, kDefaultTimeout);
AddBufferedIceCandidates(); AddBufferedIceCandidates();
callee->AddBufferedIceCandidates(); callee->AddBufferedIceCandidates();
WAIT(IsConnected(), kDefaultTimeout); WAIT(IsConnected(), kDefaultTimeout);
@ -222,11 +233,12 @@ class PeerConnectionWrapperForUsageHistogramTest
buffered_candidates_; buffered_candidates_;
}; };
// Buffers candidates until we add them via AddBufferedIceCandidates.
void ObserverForUsageHistogramTest::OnIceCandidate( void ObserverForUsageHistogramTest::OnIceCandidate(
const webrtc::IceCandidateInterface* candidate) { const webrtc::IceCandidateInterface* candidate) {
// If target is not set, ignore. This happens in one-ended unit tests. // If target is not set, ignore. This happens in one-ended unit tests.
if (candidate_target_) { if (candidate_target_) {
this->candidate_target_->AddOrBufferIceCandidate(candidate); this->candidate_target_->BufferIceCandidate(candidate);
} }
candidate_gathered_ = true; candidate_gathered_ = true;
} }