From: Geliang Tang <tanggeliang@kylinos.cn>
MPTCP requires longer timeouts in pollin test due to subflow establishment
delays and slower state transitions. Increase timeout values to prevent
false failures:
# RUN tls.13_sm4_ccm_mptcp.pollin ...
# tls.c:1411:pollin:Expected poll(&fd, 1, 20) (0) == 1 (1)
# tls.c:1412:pollin:Expected fd.revents & POLLIN (0) == 1 (1)
# pollin: Test failed
# FAIL tls.13_sm4_ccm_mptcp.pollin
not ok 357 tls.13_sm4_ccm_mptcp.pollin
Co-developed-by: Gang Yan <yangang@kylinos.cn>
Signed-off-by: Gang Yan <yangang@kylinos.cn>
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
tools/testing/selftests/net/tls.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c
index 21f73a9867ea..55d5942b9ecd 100644
--- a/tools/testing/selftests/net/tls.c
+++ b/tools/testing/selftests/net/tls.c
@@ -1301,6 +1301,7 @@ TEST_F(tls, bidir)
TEST_F(tls, pollin)
{
+ int timeout = variant->mptcp ? 100 : 20;
char const *test_str = "test_poll";
struct pollfd fd = { 0, 0, 0 };
char buf[10];
@@ -1310,11 +1311,11 @@ TEST_F(tls, pollin)
fd.fd = self->cfd;
fd.events = POLLIN;
- EXPECT_EQ(poll(&fd, 1, 20), 1);
+ EXPECT_EQ(poll(&fd, 1, timeout), 1);
EXPECT_EQ(fd.revents & POLLIN, 1);
EXPECT_EQ(recv(self->cfd, buf, send_len, MSG_WAITALL), send_len);
/* Test timing out */
- EXPECT_EQ(poll(&fd, 1, 20), 0);
+ EXPECT_EQ(poll(&fd, 1, timeout), 0);
}
TEST_F(tls, poll_wait)
--
2.51.0