This is an automated email from the ASF dual-hosted git repository.
wwbmmm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brpc.git
The following commit(s) were added to refs/heads/master by this push:
new dea05702 Fix naming service unittest fail (#3153)
dea05702 is described below
commit dea05702421d83931df28e8c9b49a5af6f0f1e76
Author: Weibing Wang <[email protected]>
AuthorDate: Sat Nov 15 14:45:24 2025 +0800
Fix naming service unittest fail (#3153)
---
test/brpc_naming_service_unittest.cpp | 47 +++++++++++++++++++++--------------
1 file changed, 28 insertions(+), 19 deletions(-)
diff --git a/test/brpc_naming_service_unittest.cpp
b/test/brpc_naming_service_unittest.cpp
index 43ac9f47..0ba2be66 100644
--- a/test/brpc_naming_service_unittest.cpp
+++ b/test/brpc_naming_service_unittest.cpp
@@ -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",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
