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

Make test framework create portallocator with an explicit PacketSocketFactory.

Browse Source 
Bug: webrtc:13145
Change-Id: I04575517b1e215a2204611415f728c358c8d64fe
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/238660
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35408}
This commit is contained in:
Niels Möller 2021-11-23 14:46:11 +01:00 committed by WebRTC LUCI CQ
parent aad4ba102b
commit 707e5a0cd7
5 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/test/peerconnection_quality_test_fixture.h
View File

@ -500,20 +500,8 @@ class PeerConnectionE2EQualityTestFixture {
// `configurer` function will be used to configure peer in the call.
virtual PeerHandle* AddPeer(
const PeerNetworkDependencies& network_dependencies,
rtc::FunctionView<void(PeerConfigurer*)> configurer) {
return AddPeer(network_dependencies.network_thread,
network_dependencies.network_manager, configurer);
}
// TODO(bugs.webrtc.org/13145): Delete, replaced by above overload with
// PeerNetworkDependencies.
virtual PeerHandle* AddPeer(
rtc::Thread* network_thread,
rtc::NetworkManager* network_manager,
rtc::FunctionView<void(PeerConfigurer*)> configurer) {
return AddPeer({network_thread, network_manager,
/*packet_socket_factory=*/nullptr},
configurer);
}
rtc::FunctionView<void(PeerConfigurer*)> configurer) = 0;
// Runs the media quality test, which includes setting up the call with
// configured participants, running it according to provided `run_params` and
// terminating it properly at the end. During call duration media quality

2
test/pc/e2e/peer_configurer.h
View File

@ -44,7 +44,7 @@ class PeerConfigurerImpl final
PeerConfigurerImpl(rtc::Thread* network_thread,
rtc::NetworkManager* network_manager,
rtc::PacketSocketFactory* packet_socket_factory = nullptr)
rtc::PacketSocketFactory* packet_socket_factory)
: components_(
std::make_unique<InjectableComponents>(network_thread,
network_manager,

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

@ -170,11 +170,11 @@ void PeerConnectionE2EQualityTest::AddQualityMetricsReporter(
}
PeerConnectionE2EQualityTest::PeerHandle* PeerConnectionE2EQualityTest::AddPeer(
rtc::Thread* network_thread,
rtc::NetworkManager* network_manager,
const PeerNetworkDependencies& network_dependencies,
rtc::FunctionView<void(PeerConfigurer*)> configurer) {
peer_configurations_.push_back(
std::make_unique<PeerConfigurerImpl>(network_thread, network_manager));
peer_configurations_.push_back(std::make_unique<PeerConfigurerImpl>(
network_dependencies.network_thread, network_dependencies.network_manager,
network_dependencies.packet_socket_factory));
configurer(peer_configurations_.back().get());
peer_handles_.push_back(PeerHandleImpl());
return &peer_handles_.back();

3
test/pc/e2e/peer_connection_quality_test.h
View File

@ -69,8 +69,7 @@ class PeerConnectionE2EQualityTest
quality_metrics_reporter) override;
PeerHandle* AddPeer(
rtc::Thread* network_thread,
rtc::NetworkManager* network_manager,
const PeerNetworkDependencies& network_dependencies,
rtc::FunctionView<void(PeerConfigurer*)> configurer) override;
void Run(RunParams run_params) override;

2
test/pc/e2e/test_peer_factory.cc
View File

@ -261,7 +261,7 @@ PeerConnectionDependencies CreatePCDependencies(
PeerConnectionDependencies pc_deps(observer);
auto port_allocator = std::make_unique<cricket::BasicPortAllocator>(
pc_dependencies->network_manager);
pc_dependencies->network_manager, pc_dependencies->packet_socket_factory);
// This test does not support TCP
int flags = cricket::PORTALLOCATOR_DISABLE_TCP;