Commit 070d6daf authored by Matthieu Baerts's avatar Matthieu Baerts Committed by David S. Miller
Browse files

selftests: mptcp: stop tests earlier 



These 'endpoint' tests from 'mptcp_join.sh' selftest start a transfer in
the background and check the status during this transfer.

Once the expected events have been recorded, there is no reason to wait
for the data transfer to finish. It can be stopped earlier to reduce the
execution time by more than half.

For these tests, the exchanged data were not verified. Errors, if any,
were ignored but that's fine, plenty of other tests are looking at that.
It is then OK to mute stderr now that we are sure errors will be printed
(and still ignored) because the transfer is stopped before the end.

Fixes: e274f715 ("selftests: mptcp: add subflow limits test-cases")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a635a8c3

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

+10 −4
Original line number Diff line number Diff line
@@ -498,6 +498,12 @@ kill_events_pids() 
	kill_wait $evts_ns2_pid

}



kill_tests_wait()

{

	kill -SIGUSR1 $(ip netns pids $ns2) $(ip netns pids $ns1)

	wait

}



pm_nl_set_limits()

{

	local ns=$1
@@ -3055,7 +3061,7 @@ endpoint_tests() 
		pm_nl_set_limits $ns1 2 2

		pm_nl_set_limits $ns2 2 2

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal

		run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow &

		run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow 2>/dev/null &



		wait_mpj $ns1

		pm_nl_check_endpoint 1 "creation" \
@@ -3068,14 +3074,14 @@ endpoint_tests() 
		pm_nl_add_endpoint $ns2 10.0.2.2 flags signal

		pm_nl_check_endpoint 0 "modif is allowed" \

			$ns2 10.0.2.2 id 1 flags signal

		wait

		kill_tests_wait

	fi



	if reset "delete and re-add"; then

		pm_nl_set_limits $ns1 1 1

		pm_nl_set_limits $ns2 1 1

		pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow

		run_tests $ns1 $ns2 10.0.1.1 4 0 0 speed_20 &

		run_tests $ns1 $ns2 10.0.1.1 4 0 0 speed_20 2>/dev/null &



		wait_mpj $ns2

		pm_nl_del_endpoint $ns2 2 10.0.2.2
@@ -3085,7 +3091,7 @@ endpoint_tests() 
		pm_nl_add_endpoint $ns2 10.0.2.2 dev ns2eth2 flags subflow

		wait_mpj $ns2

		chk_subflow_nr "" "after re-add" 2

		wait

		kill_tests_wait

	fi

}