From 074dece0855f6ee925d355cf8822eaa2375822c2 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Tue, 24 Oct 2017 13:04:12 -0700 Subject: [PATCH] Fix flaky DataChannel integration test The DataChannel OPEN message is sent in-band in this test, and waiting for the signaling state to change is not sufficient to guarantee that the callee received this message Bug: webrtc:8443 Change-Id: I76fa6348b6f8e1e70fb41a4e644aee805b2ef4de Reviewed-on: https://webrtc-review.googlesource.com/15060 Commit-Queue: Steve Anton Reviewed-by: Taylor Brandstetter Cr-Commit-Position: refs/heads/master@{#20415} --- pc/peerconnection_integrationtest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pc/peerconnection_integrationtest.cc b/pc/peerconnection_integrationtest.cc index 0d6c87f7b0..3289ccbf59 100644 --- a/pc/peerconnection_integrationtest.cc +++ b/pc/peerconnection_integrationtest.cc @@ -2610,7 +2610,8 @@ TEST_F(PeerConnectionIntegrationTest, SctpDataChannelConfigSentToOtherSide) { callee()->AddAudioVideoMediaStream(); caller()->CreateAndSetAndSignalOffer(); ASSERT_TRUE_WAIT(SignalingStateStable(), kDefaultTimeout); - ASSERT_TRUE(callee()->data_channel()); + ASSERT_TRUE_WAIT(callee()->data_channel() != nullptr, kDefaultTimeout); + ASSERT_TRUE_WAIT(callee()->data_observer()->IsOpen(), kDefaultTimeout); EXPECT_EQ(init.id, callee()->data_channel()->id()); EXPECT_EQ("data-channel", callee()->data_channel()->label()); EXPECT_EQ(init.maxRetransmits, callee()->data_channel()->maxRetransmits());