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

Unflaking PeerConnectionIntegrationTest.DtmfSenderObserver.

Browse Source 
The test attempted to call InsertDtmf before verifying that the DTLS
handshake was complete. Unlike a data channel, the DTMF sender doesn't
do any buffering, so this isn't reliable.

BUG=webrtc:7547
NOTRY=True

Review-Url: https://codereview.webrtc.org/2855573004
Cr-Commit-Position: refs/heads/master@{#18041}
This commit is contained in:
deadbeef
2017-05-07 17:21:01 -07:00
committed by Commit bot
parent 6373774106
commit 7145280954
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
webrtc/pc/peerconnection_integrationtest.cc
View File

@ -958,6 +958,20 @@ class PeerConnectionIntegrationTest : public testing::Test {
return caller_->SignalingStateStable() && callee_->SignalingStateStable(); return caller_->SignalingStateStable() && callee_->SignalingStateStable();
} }
bool DtlsConnected() {
// TODO(deadbeef): kIceConnectionConnected currently means both ICE and DTLS
// are connected. This is an important distinction. Once we have separate
// ICE and DTLS state, this check needs to use the DTLS state.
return (callee()->ice_connection_state() ==
webrtc::PeerConnectionInterface::kIceConnectionConnected ||
callee()->ice_connection_state() ==
webrtc::PeerConnectionInterface::kIceConnectionCompleted) &&
(caller()->ice_connection_state() ==
webrtc::PeerConnectionInterface::kIceConnectionConnected ||
caller()->ice_connection_state() ==
webrtc::PeerConnectionInterface::kIceConnectionCompleted);
}
bool CreatePeerConnectionWrappers() { bool CreatePeerConnectionWrappers() {
return CreatePeerConnectionWrappersWithConfig( return CreatePeerConnectionWrappersWithConfig(
PeerConnectionInterface::RTCConfiguration(), PeerConnectionInterface::RTCConfiguration(),
@ -1245,6 +1259,8 @@ TEST_F(PeerConnectionIntegrationTest, DtmfSenderObserver) {
callee()->AddAudioOnlyMediaStream(); callee()->AddAudioOnlyMediaStream();
caller()->CreateAndSetAndSignalOffer(); caller()->CreateAndSetAndSignalOffer();
ASSERT_TRUE_WAIT(SignalingStateStable(), kDefaultTimeout); ASSERT_TRUE_WAIT(SignalingStateStable(), kDefaultTimeout);
// DTLS must finish before the DTMF sender can be used reliably.
ASSERT_TRUE_WAIT(DtlsConnected(), kDefaultTimeout);
TestDtmfFromSenderToReceiver(caller(), callee()); TestDtmfFromSenderToReceiver(caller(), callee());
TestDtmfFromSenderToReceiver(callee(), caller()); TestDtmfFromSenderToReceiver(callee(), caller());
} }
@ -2781,19 +2797,8 @@ TEST_F(PeerConnectionIntegrationTest, EndToEndConnectionTimeWithTurnTurnPair) {
options.offer_to_receive_video = 1; options.offer_to_receive_video = 1;
caller()->SetOfferAnswerOptions(options); caller()->SetOfferAnswerOptions(options);
caller()->CreateAndSetAndSignalOffer(); caller()->CreateAndSetAndSignalOffer();
// TODO(deadbeef): kIceConnectionConnected currently means both ICE and DTLS EXPECT_TRUE_SIMULATED_WAIT(DtlsConnected(), total_connection_time_ms,
// are connected. This is an important distinction. Once we have separate ICE fake_clock);
// and DTLS state, this check needs to use the DTLS state.
EXPECT_TRUE_SIMULATED_WAIT(
(callee()->ice_connection_state() ==
webrtc::PeerConnectionInterface::kIceConnectionConnected ||
callee()->ice_connection_state() ==
webrtc::PeerConnectionInterface::kIceConnectionCompleted) &&
(caller()->ice_connection_state() ==
webrtc::PeerConnectionInterface::kIceConnectionConnected ||
caller()->ice_connection_state() ==
webrtc::PeerConnectionInterface::kIceConnectionCompleted),
total_connection_time_ms, fake_clock);
// Need to free the clients here since they're using things we created on // Need to free the clients here since they're using things we created on
// the stack. // the stack.
delete SetCallerPcWrapperAndReturnCurrent(nullptr); delete SetCallerPcWrapperAndReturnCurrent(nullptr);