From b6458e1af240ee23f9f0ebc0d769c774d181aa05 Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Thu, 31 Jan 2019 14:42:57 +0100 Subject: [PATCH] Switch test on audio stream instead of data channel. Create audio stream instead of data channel to check compatibility of network layer with PeerConnection. Replacement is done because there is a data race inside data channel sctp transport. This CL will fix bot behavior. Further data race investigation will be done in this bug: https://bugs.chromium.org/p/webrtc/issues/detail?id=10268 Bug: webrtc:10268, webrtc:10138 Change-Id: I4f7a1116c65dbf4a3508b7d81d654ccd320795f0 Reviewed-on: https://webrtc-review.googlesource.com/c/120807 Reviewed-by: Ilya Nikolaevskiy Reviewed-by: Sebastian Jansson Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#26495} --- .../network/network_emulation_pc_unittest.cc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/test/scenario/network/network_emulation_pc_unittest.cc b/test/scenario/network/network_emulation_pc_unittest.cc index 105cb56bbd..f2fcb07da4 100644 --- a/test/scenario/network/network_emulation_pc_unittest.cc +++ b/test/scenario/network/network_emulation_pc_unittest.cc @@ -159,8 +159,11 @@ TEST(NetworkEmulationManagerPCTest, Run) { network_manager.Start(); signaling_thread->Invoke(RTC_FROM_HERE, [&]() { - rtc::scoped_refptr channel = - alice->CreateDataChannel("data"); + rtc::scoped_refptr source = + alice_pcf->CreateAudioSource(cricket::AudioOptions()); + rtc::scoped_refptr track = + alice_pcf->CreateAudioTrack("audio", source); + alice->AddTransceiver(track); // Connect peers. ASSERT_TRUE(alice->ExchangeOfferAnswerWith(bob.get())); @@ -180,13 +183,6 @@ TEST(NetworkEmulationManagerPCTest, Run) { ASSERT_TRUE_WAIT(bob->IsIceConnected(), kDefaultTimeoutMs); ASSERT_TRUE_WAIT(alice->IsIceConnected(), kDefaultTimeoutMs); - ASSERT_TRUE_WAIT(bob->observer()->last_datachannel_ != nullptr, - kDefaultTimeoutMs); - MockDataChannelObserver observer(bob->observer()->last_datachannel_); - channel->Send(DataBuffer("Test data")); - ASSERT_TRUE_WAIT(observer.received_message_count() == 1, kDefaultTimeoutMs); - ASSERT_EQ("Test data", observer.last_message()); - // Close peer connections alice->pc()->Close(); bob->pc()->Close();