Commit 9109853a authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

selftests: mptcp: add ms units for tc-netem delay 



'delay 1' in tc-netem is confusing, not sure if it's a delay of 1 second or
1 millisecond. This patch explicitly adds millisecond units to make these
commands clearer.

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f30b04ca

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

+3 −3
Original line number Diff line number Diff line
@@ -125,8 +125,8 @@ init_shapers() 
{

	local i

	for i in $(seq 1 4); do

		tc -n $ns1 qdisc add dev ns1eth$i root netem rate 20mbit delay 1

		tc -n $ns2 qdisc add dev ns2eth$i root netem rate 20mbit delay 1

		tc -n $ns1 qdisc add dev ns1eth$i root netem rate 20mbit delay 1ms

		tc -n $ns2 qdisc add dev ns2eth$i root netem rate 20mbit delay 1ms

	done

}
@@ -3212,7 +3212,7 @@ fail_tests() 


	# multiple subflows

	if reset_with_fail "MP_FAIL MP_RST" 2; then

		tc -n $ns2 qdisc add dev ns2eth1 root netem rate 1mbit delay 5

		tc -n $ns2 qdisc add dev ns2eth1 root netem rate 1mbit delay 5ms

		pm_nl_set_limits $ns1 0 1

		pm_nl_set_limits $ns2 0 1

		pm_nl_add_endpoint $ns2 10.0.2.2 dev ns2eth2 flags subflow

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

+2 −2
Original line number Diff line number Diff line
@@ -216,8 +216,8 @@ run_test() 
	shift 4

	local msg=$*



	[ $delay1 -gt 0 ] && delay1="delay $delay1" || delay1=""

	[ $delay2 -gt 0 ] && delay2="delay $delay2" || delay2=""

	[ $delay1 -gt 0 ] && delay1="delay ${delay1}ms" || delay1=""

	[ $delay2 -gt 0 ] && delay2="delay ${delay2}ms" || delay2=""



	for dev in ns1eth1 ns1eth2; do

		tc -n $ns1 qdisc del dev $dev root >/dev/null 2>&1