From 158879305bf5910c0b9e3630a073324a048b59ef Mon Sep 17 00:00:00 2001 From: deadbeef Date: Mon, 14 Dec 2015 19:32:34 -0800 Subject: [PATCH] Fixing flaky LocalP2PTestSctpDataChannel test. SCTP data channels are closed asynchronously in-band, unlike RTP data channels, so the test must be slightly modified. TBR=pthatcher@webrtc.org Review URL: https://codereview.webrtc.org/1527833003 Cr-Commit-Position: refs/heads/master@{#11017} --- talk/app/webrtc/peerconnection_unittest.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/talk/app/webrtc/peerconnection_unittest.cc b/talk/app/webrtc/peerconnection_unittest.cc index af18e11786..55e4da86fb 100644 --- a/talk/app/webrtc/peerconnection_unittest.cc +++ b/talk/app/webrtc/peerconnection_unittest.cc @@ -1615,10 +1615,9 @@ TEST_F(P2PTestConductor, LocalP2PTestSctpDataChannel) { kMaxWaitMs); receiving_client()->data_channel()->Close(); - // Send new offer and answer. - receiving_client()->Negotiate(); - EXPECT_FALSE(initializing_client()->data_observer()->IsOpen()); - EXPECT_FALSE(receiving_client()->data_observer()->IsOpen()); + EXPECT_TRUE_WAIT(!initializing_client()->data_observer()->IsOpen(), + kMaxWaitMs); + EXPECT_TRUE_WAIT(!receiving_client()->data_observer()->IsOpen(), kMaxWaitMs); } // This test sets up a call between two parties and creates a data channel.