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 3dbf35b9 Fix unstable keepalive ut (#2261)
3dbf35b9 is described below
commit 3dbf35b970670c6a058f20bba1c282daf3292581
Author: Weibing Wang <[email protected]>
AuthorDate: Mon May 22 16:05:49 2023 +0800
Fix unstable keepalive ut (#2261)
---
test/brpc_socket_unittest.cpp | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/test/brpc_socket_unittest.cpp b/test/brpc_socket_unittest.cpp
index 10ee988c..3f080911 100644
--- a/test/brpc_socket_unittest.cpp
+++ b/test/brpc_socket_unittest.cpp
@@ -1116,6 +1116,7 @@ TEST_F(SocketTest, keepalive) {
brpc::SocketUniquePtr ptr;
ASSERT_EQ(0, brpc::Socket::Address(id, &ptr));
CheckNoKeepalive(ptr->fd());
+ sockfd.release();
}
int keepalive_idle = 1;
@@ -1136,6 +1137,7 @@ TEST_F(SocketTest, keepalive) {
default_keepalive_idle,
default_keepalive_interval,
default_keepalive_count);
+ sockfd.release();
}
// Enable keepalive and set keepalive idle.
@@ -1155,6 +1157,7 @@ TEST_F(SocketTest, keepalive) {
keepalive_idle,
default_keepalive_interval,
default_keepalive_count);
+ sockfd.release();
}
// Enable keepalive and set keepalive interval.
@@ -1174,6 +1177,7 @@ TEST_F(SocketTest, keepalive) {
default_keepalive_idle,
keepalive_interval,
default_keepalive_count);
+ sockfd.release();
}
// Enable keepalive and set keepalive count.
@@ -1193,6 +1197,7 @@ TEST_F(SocketTest, keepalive) {
default_keepalive_idle,
default_keepalive_interval,
keepalive_count);
+ sockfd.release();
}
// Enable keepalive and set keepalive idle, interval, count.
@@ -1216,6 +1221,7 @@ TEST_F(SocketTest, keepalive) {
keepalive_idle,
keepalive_interval,
keepalive_count);
+ sockfd.release();
}
}
@@ -1245,6 +1251,7 @@ TEST_F(SocketTest, keepalive_input_message) {
brpc::SocketUniquePtr ptr;
ASSERT_EQ(0, brpc::Socket::Address(id, &ptr));
CheckNoKeepalive(ptr->fd());
+ sockfd.release();
}
// Enable keepalive.
@@ -1263,6 +1270,7 @@ TEST_F(SocketTest, keepalive_input_message) {
default_keepalive_idle,
default_keepalive_interval,
default_keepalive_count);
+ sockfd.release();
}
// Enable keepalive and set keepalive idle.
@@ -1281,6 +1289,7 @@ TEST_F(SocketTest, keepalive_input_message) {
brpc::FLAGS_socket_keepalive_idle_s,
default_keepalive_interval,
default_keepalive_count);
+ sockfd.release();
}
// Enable keepalive and set keepalive idle, interval.
@@ -1299,6 +1308,7 @@ TEST_F(SocketTest, keepalive_input_message) {
brpc::FLAGS_socket_keepalive_idle_s,
brpc::FLAGS_socket_keepalive_interval_s,
default_keepalive_count);
+ sockfd.release();
}
// Enable keepalive and set keepalive idle, interval, count.
@@ -1317,6 +1327,7 @@ TEST_F(SocketTest, keepalive_input_message) {
brpc::FLAGS_socket_keepalive_idle_s,
brpc::FLAGS_socket_keepalive_interval_s,
brpc::FLAGS_socket_keepalive_count);
+ sockfd.release();
}
// Options of keepalive set by user have priority over Gflags.
@@ -1340,6 +1351,7 @@ TEST_F(SocketTest, keepalive_input_message) {
keepalive_idle,
brpc::FLAGS_socket_keepalive_interval_s,
brpc::FLAGS_socket_keepalive_count);
+ sockfd.release();
}
{
@@ -1359,6 +1371,7 @@ TEST_F(SocketTest, keepalive_input_message) {
brpc::FLAGS_socket_keepalive_idle_s,
keepalive_interval,
brpc::FLAGS_socket_keepalive_count);
+ sockfd.release();
}
{
@@ -1378,6 +1391,7 @@ TEST_F(SocketTest, keepalive_input_message) {
brpc::FLAGS_socket_keepalive_idle_s,
brpc::FLAGS_socket_keepalive_interval_s,
keepalive_count);
+ sockfd.release();
}
{
@@ -1401,5 +1415,6 @@ TEST_F(SocketTest, keepalive_input_message) {
keepalive_idle,
keepalive_interval,
keepalive_count);
+ sockfd.release();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
