Commit 386e02c7 authored by Geliang Tang's avatar Geliang Tang Committed by Geliang Tang
Browse files

selftests: mptcp: connect: fix misaligned output 

mainline inclusion
from mainline-v6.9-rc1
commit c9161a0f8ff96f4e1980e2e24a222cd65143edf5
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=c9161a0f8ff96f4e1980e2e24a222cd65143edf5



--------------------------------

The first [ OK ] in the output of mptcp_connect.sh misaligns with the
others:

New MPTCP socket can be blocked via sysctl              [ OK ]
INFO: validating network environment with pings
INFO: Using loss of 0.85% delay 16 ms reorder 95% 70% with delay 4ms on
ns1 MPTCP -> ns1 (10.0.1.1:10000      ) MPTCP   (duration   184ms) [ OK ]
ns1 MPTCP -> ns1 (10.0.1.1:10001      ) TCP     (duration    50ms) [ OK ]
ns1 TCP   -> ns1 (10.0.1.1:10002      ) MPTCP   (duration    55ms) [ OK ]

This patch aligns them by using 69 chars to display the first two lines,
and 50 chars for the other. Since 19 chars are used to display duration
time. Also print out a [ OK ] at the end of the 2nd line for consistency.

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>
Link: https://lore.kernel.org/r/20240308-upstream-net-next-20240308-selftests-mptcp-unification-v1-3-4f42c347b653@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent cd9e21e2

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

+10 −3
Original line number Diff line number Diff line
@@ -248,11 +248,17 @@ else 
	set_ethtool_flags "$ns4" ns4eth3 "$ethtool_args"

fi



print_larger_title() {

	# here we don't have the time, a bit longer for the alignment

	printf "%-69s" "${@}"

}



check_mptcp_disabled()

{

	local disabled_ns

	mptcp_lib_ns_init disabled_ns



	print_larger_title "New MPTCP socket can be blocked via sysctl"

	# net.mptcp.enabled should be enabled by default

	if [ "$(ip netns exec ${disabled_ns} sysctl net.mptcp.enabled | awk '{ print $3 }')" -ne 1 ]; then

		echo -e "net.mptcp.enabled sysctl is not 1 by default\t\t[ FAIL ]"
@@ -274,7 +280,7 @@ check_mptcp_disabled() 
		return 1

	fi



	echo -e "New MPTCP socket can be blocked via sysctl\t\t[ OK ]"

	echo "[ OK ]"

	mptcp_lib_result_pass "New MPTCP socket can be blocked via sysctl"

	return 0

}
@@ -342,7 +348,7 @@ do_transfer() 
	addr_port=$(printf "%s:%d" ${connect_addr} ${port})

	local result_msg

	result_msg="$(printf "%.3s %-5s -> %.3s (%-20s) %-5s" ${connector_ns} ${cl_proto} ${listener_ns} ${addr_port} ${srv_proto})"

	printf "%s\t" "${result_msg}"

	printf "%-50s" "${result_msg}"



	if $capture; then

		local capuser
@@ -847,7 +853,7 @@ check_mptcp_disabled 


stop_if_error "The kernel configuration is not valid for MPTCP"



echo "INFO: validating network environment with pings"

print_larger_title "Validating network environment with pings"

for sender in "$ns1" "$ns2" "$ns3" "$ns4";do

	do_ping "$ns1" $sender 10.0.1.1

	do_ping "$ns1" $sender dead:beef:1::1
@@ -869,6 +875,7 @@ done 
mptcp_lib_result_code "${ret}" "ping tests"



stop_if_error "Could not even run ping tests"

echo "[ OK ]"



[ -n "$tc_loss" ] && tc -net "$ns2" qdisc add dev ns2eth3 root netem loss random $tc_loss delay ${tc_delay}ms

tc_info="loss of $tc_loss "