Skip to content

Fix naming service unittest fail #3153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wwbmmm merged 1 commit into from
Nov 15, 2025
Merged

Fix naming service unittest fail #3153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 28 additions & 19 deletions test/brpc_naming_service_unittest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,33 +77,42 @@ TEST(NamingServiceTest, sanity) {
ASSERT_EQ(0, bns.GetServers("qa-pbrpc.SAT.tjyx", &servers));
#endif

auto collect_ips = [&servers]() {
std::set<butil::ip_t> ret;
for (auto& server : servers) {
ret.insert(server.addr.ip);
}
return ret;
};
brpc::policy::DomainNamingService dns;
ASSERT_EQ(0, dns.GetServers("baidu.com:1234", &servers));
ASSERT_EQ(2u, servers.size());
ASSERT_EQ(1234, servers[0].addr.port);
ASSERT_EQ(1234, servers[1].addr.port);
const std::set<butil::ip_t> expected_ips{servers[0].addr.ip, servers[1].addr.ip};
size_t server_size = servers.size();
ASSERT_GE(server_size, 1);
for (size_t i = 0; i < servers.size(); ++i) {
ASSERT_EQ(1234, servers[i].addr.port);
}
const auto expected_ips = collect_ips();

ASSERT_EQ(0, dns.GetServers("baidu.com", &servers));
ASSERT_EQ(2u, servers.size());
const std::set<butil::ip_t> ip_list1{servers[0].addr.ip, servers[1].addr.ip};
ASSERT_TRUE(IsIPListEqual(expected_ips, ip_list1));
ASSERT_EQ(80, servers[0].addr.port);
ASSERT_EQ(80, servers[1].addr.port);
ASSERT_EQ(server_size, servers.size());
ASSERT_TRUE(IsIPListEqual(expected_ips, collect_ips()));
for (size_t i = 0; i < servers.size(); ++i) {
ASSERT_EQ(80, servers[i].addr.port);
}

ASSERT_EQ(0, dns.GetServers("baidu.com:1234/useless1/useless2", &servers));
ASSERT_EQ(2u, servers.size());
const std::set<butil::ip_t> ip_list2{servers[0].addr.ip, servers[1].addr.ip};
ASSERT_TRUE(IsIPListEqual(expected_ips, ip_list2));
ASSERT_EQ(1234, servers[0].addr.port);
ASSERT_EQ(1234, servers[1].addr.port);
ASSERT_EQ(server_size, servers.size());
ASSERT_TRUE(IsIPListEqual(expected_ips, collect_ips()));
for (size_t i = 0; i < servers.size(); ++i) {
ASSERT_EQ(1234, servers[i].addr.port);
}

ASSERT_EQ(0, dns.GetServers("baidu.com/useless1/useless2", &servers));
ASSERT_EQ(2u, servers.size());
const std::set<butil::ip_t> ip_list3{servers[0].addr.ip, servers[1].addr.ip};
ASSERT_TRUE(IsIPListEqual(expected_ips, ip_list3));
ASSERT_EQ(80, servers[0].addr.port);
ASSERT_EQ(80, servers[1].addr.port);
ASSERT_EQ(server_size, servers.size());
ASSERT_TRUE(IsIPListEqual(expected_ips, collect_ips()));
for (size_t i = 0; i < servers.size(); ++i) {
ASSERT_EQ(80, servers[i].addr.port);
}

const char *address_list[] = {
"10.127.0.1:1234",
Expand Down
Loading