Re: [PATCH mptcp-next] selftests: mptcp: move prefix tests of addr_nr_ns2 together

[Mat Martineau <mathew.j.martineau@linux.intel.com>]

On Mon, 8 Aug 2022, Geliang Tang wrote:

> Move the fullmesh prefix test of addr_nr_ns2 together with its other
> prefix tests.
>
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>

Looks good to me, thanks Geliang:

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

> ---
> tools/testing/selftests/net/mptcp/mptcp_join.sh | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> index ff83ef426df5..2957fe414639 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> @@ -706,6 +706,7 @@ do_transfer()
> 		addr_nr_ns1=${addr_nr_ns1:10}
> 	fi
>
> +	local flags="subflow"
> 	if [[ "${addr_nr_ns2}" = "fastclose_"* ]]; then
> 		# disconnect
> 		extra_args="$extra_args -I ${addr_nr_ns2:10}"
> @@ -713,6 +714,9 @@ do_transfer()
> 	elif [[ "${addr_nr_ns2}" = "userspace_"* ]]; then
> 		userspace_pm=1
> 		addr_nr_ns2=${addr_nr_ns2:10}
> +	elif [[ "${addr_nr_ns2}" = "fullmesh_"* ]]; then
> +		flags="${flags},fullmesh"
> +		addr_nr_ns2=${addr_nr_ns2:9}
> 	fi
>
> 	if [ $userspace_pm -eq 1 ]; then
> @@ -832,12 +836,6 @@ do_transfer()
> 		fi
> 	fi
>
> -	local flags="subflow"
> -	if [[ "${addr_nr_ns2}" = "fullmesh_"* ]]; then
> -		flags="${flags},fullmesh"
> -		addr_nr_ns2=${addr_nr_ns2:9}
> -	fi
> -
> 	# if newly added endpoints must be deleted, give the background msk
> 	# some time to created them
> 	[ $addr_nr_ns1 -gt 0 ] && [ $addr_nr_ns2 -lt 0 ] && sleep 1
> -- 
> 2.35.3
>
>
>

--
Mat Martineau
Intel