mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 13:50:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change the NetworkTesterTest.ClientServer test to use a random port number to avoid collisions

Browse source 
Bug: webrtc:15575
Change-Id: Ied0bdc79d52edd0d919be007798135c1c6b1f98b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/323820
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40966}
This commit is contained in:
Liad Rubin 2023-10-18 16:44:01 +03:00 committed by WebRTC LUCI CQ
parent 49f08ba8ac
commit a88a4b7050
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
rtc_tools/network_tester/BUILD.gn
View file

@ -86,6 +86,7 @@ if (rtc_enable_protobuf) {
deps = [ deps = [
":network_tester", ":network_tester",
"../../rtc_base:gunit_helpers", "../../rtc_base:gunit_helpers",
"../../rtc_base:random",
"../../rtc_base:threading", "../../rtc_base:threading",
"../../test:fileutils", "../../test:fileutils",
"../../test:test_support", "../../test:test_support",

12
rtc_tools/network_tester/network_tester_unittest.cc
View file

@ -13,6 +13,7 @@
#include <string> #include <string>
#include "rtc_base/gunit.h" #include "rtc_base/gunit.h"
#include "rtc_base/random.h"
#include "rtc_tools/network_tester/test_controller.h" #include "rtc_tools/network_tester/test_controller.h"
#include "test/gtest.h" #include "test/gtest.h"
#include "test/testsupport/file_utils.h" #include "test/testsupport/file_utils.h"
@ -20,15 +21,22 @@
namespace webrtc { namespace webrtc {
TEST(NetworkTesterTest, ServerClient) { TEST(NetworkTesterTest, ServerClient) {
// Use a unique port rather than a hard-coded one to avoid collision when
// running the test in parallel in stress runs. Skipping all reserved ports.
const int MIN_PORT = 49152;
const int MAX_PORT = 65535;
int port = webrtc::Random(rtc::TimeMicros()).Rand(MIN_PORT, MAX_PORT);
rtc::AutoThread main_thread; rtc::AutoThread main_thread;
TestController client( TestController client(
0, 0, webrtc::test::ResourcePath("network_tester/client_config", "dat"), 0, 0, webrtc::test::ResourcePath("network_tester/client_config", "dat"),
webrtc::test::OutputPath() + "client_packet_log.dat"); webrtc::test::OutputPath() + "client_packet_log.dat");
TestController server( TestController server(
9090, 9090, port, port,
webrtc::test::ResourcePath("network_tester/server_config", "dat"), webrtc::test::ResourcePath("network_tester/server_config", "dat"),
webrtc::test::OutputPath() + "server_packet_log.dat"); webrtc::test::OutputPath() + "server_packet_log.dat");
client.SendConnectTo("127.0.0.1", 9090); client.SendConnectTo("127.0.0.1", port);
EXPECT_TRUE_WAIT(server.IsTestDone() && client.IsTestDone(), 2000); EXPECT_TRUE_WAIT(server.IsTestDone() && client.IsTestDone(), 2000);
} }

1
rtc_tools/network_tester/test_controller.cc
View file

@ -43,6 +43,7 @@ TestController::TestController(int min_port,
udp_socket_ = udp_socket_ =
std::unique_ptr<rtc::AsyncPacketSocket>(socket_factory_.CreateUdpSocket( std::unique_ptr<rtc::AsyncPacketSocket>(socket_factory_.CreateUdpSocket(
rtc::SocketAddress(rtc::GetAnyIP(AF_INET), 0), min_port, max_port)); rtc::SocketAddress(rtc::GetAnyIP(AF_INET), 0), min_port, max_port));
RTC_CHECK(udp_socket_ != nullptr);
udp_socket_->SignalReadPacket.connect(this, &TestController::OnReadPacket); udp_socket_->SignalReadPacket.connect(this, &TestController::OnReadPacket);
}); });
} }