Skip to content

Commit 31ee4ad

Browse files
matttbekuba-moo
authored andcommitted
selftests: mptcp: join: stop transfer when check is done (part 1)
Since the "Fixes" commit mentioned below, "userspace pm" subtests of mptcp_join selftests introduced in v6.5 are launching the whole transfer in the background, do the required checks, then wait for the end of transfer. There is no need to wait longer, especially because the checks at the end of the transfer are ignored (which is fine). This saves quite a few seconds in slow environments. Note that old versions will need commit bdbef0a ("selftests: mptcp: add mptcp_lib_kill_wait") as well to get 'mptcp_lib_kill_wait()' helper. Fixes: 4369c19 ("selftests: mptcp: test userspace pm out of transfer") Cc: [email protected] # 6.5.x: bdbef0a: selftests: mptcp: add mptcp_lib_kill_wait Cc: [email protected] # 6.5.x Reviewed-and-tested-by: Geliang Tang <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://lore.kernel.org/r/20240131-upstream-net-20240131-mptcp-ci-issues-v1-8-4c1c11e571ff@kernel.org Signed-off-by: Jakub Kicinski <[email protected]>
1 parent de46d13 commit 31ee4ad

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tools/testing/selftests/net/mptcp/mptcp_join.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3453,7 +3453,7 @@ userspace_tests()
34533453
chk_mptcp_info subflows 0 subflows 0
34543454
chk_subflows_total 1 1
34553455
kill_events_pids
3456-
wait $tests_pid
3456+
mptcp_lib_kill_wait $tests_pid
34573457
fi
34583458

34593459
# userspace pm create destroy subflow
@@ -3475,7 +3475,7 @@ userspace_tests()
34753475
chk_mptcp_info subflows 0 subflows 0
34763476
chk_subflows_total 1 1
34773477
kill_events_pids
3478-
wait $tests_pid
3478+
mptcp_lib_kill_wait $tests_pid
34793479
fi
34803480

34813481
# userspace pm create id 0 subflow

0 commit comments

Comments
 (0)