[test] Fixing ConnectNonBlocking: delay listen to prevent connection from being established too early

Mikolaj Malecki · cl-ment · commit 952f9495246a · 2025-03-21T11:31:04.000+01:00
diff --git a/test/test_bonding.cpp b/test/test_bonding.cpp
@@ -732,7 +732,6 @@ TEST(Bonding, ConnectNonBlocking)
         EXPECT_NE(srt_bind(g_listen_socket, sa.get(), sa.size()), -1);
         const int yes = 1;
         srt_setsockflag(g_listen_socket, SRTO_GROUPCONNECT, &yes, sizeof yes);
-        EXPECT_NE(srt_listen(g_listen_socket, 5), -1);
 
         int lsn_eid = srt_epoll_create();
         int lsn_events = SRT_EPOLL_IN | SRT_EPOLL_ERR | SRT_EPOLL_UPDATE;
@@ -770,8 +769,14 @@ TEST(Bonding, ConnectNonBlocking)
 
                 ThreadName::set("TEST_A");
 
-                cout << "[A] Waiting for accept\n";
+                cout << "[A] Waiting for main thread to pass connect()\n";
+
+                // Delay with executing accept to keep the peer in "in progress"
+                // connection state.
+                connect_passed.get_future().get();
+                EXPECT_NE(srt_listen(g_listen_socket, 5), SRT_ERROR);
 
+                cout << "[A] Waiting for accept\n";
                 // This can wait in infinity; worst case it will be killed in process.
                 int uwait_res = srt_epoll_uwait(lsn_eid, ev, 3, -1);
                 EXPECT_EQ(uwait_res, 1);
@@ -783,9 +788,6 @@ TEST(Bonding, ConnectNonBlocking)
                 bool have_also_update = ev[0].events & SRT_EPOLL_UPDATE;
 
                 cout << "[A] Accept delay until connect done...\n";
-                // Delay with executing accept to keep the peer in "in progress"
-                // connection state.
-                connect_passed.get_future().get();
 
                 cout << "[A] Accept: go on\n";
 
