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

Fix thread usage in PC level tests for getting to the IceConnected state

Browse Source 
Bug: webrtc:11743
Change-Id: I18a6318c35b350b3d729bbd5ac1d25f035e6ad9d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178809
Reviewed-by: Tommi <tommi@webrtc.org>
Reviewed-by: Andrey Logvin <landrey@webrtc.org>
Commit-Queue: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31658}
This commit is contained in:
Artem Titov 2020-07-07 13:35:28 +02:00 committed by Commit Bot
parent ce1ff6f8a7
commit 656efbee6f
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/test/time_controller.h
View File

@ -60,6 +60,8 @@ class TimeController {
// Waits until condition() == true, polling condition() in small time
// intervals.
// Returns true if condition() was evaluated to true before |max_duration|
// elapsed and false otherwise.
bool Wait(const std::function<bool()>& condition,
TimeDelta max_duration = TimeDelta::Seconds(5));
};

17
test/pc/e2e/peer_connection_quality_test.cc
View File

@ -578,15 +578,18 @@ void PeerConnectionE2EQualityTest::WaitUntilIceCandidatesGathered(
void PeerConnectionE2EQualityTest::WaitUntilPeersAreConnected(
rtc::Thread* signaling_thread) {
// This means that ICE and DTLS are connected.
time_controller_.Wait(
alice_connected_ = time_controller_.Wait(
[&]() {
return signaling_thread->Invoke<bool>(RTC_FROM_HERE, [&]() {
return alice_->IsIceConnected() && bob_->IsIceConnected();
});
return signaling_thread->Invoke<bool>(
RTC_FROM_HERE, [&]() { return alice_->IsIceConnected(); });
},
2 * kDefaultTimeout);
alice_connected_ = alice_->IsIceConnected();
bob_connected_ = bob_->IsIceConnected();
kDefaultTimeout);
bob_connected_ = time_controller_.Wait(
[&]() {
return signaling_thread->Invoke<bool>(
RTC_FROM_HERE, [&]() { return bob_->IsIceConnected(); });
},
kDefaultTimeout);
}
void PeerConnectionE2EQualityTest::ExchangeOfferAnswer(