selftests: mptcp: move prefix tests of addr_nr_ns2 together

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

Posted by Geliang Tang 1 year, 8 months ago

Move the fullmesh prefix test of addr_nr_ns2 together with its other
prefix tests.

Signed-off-by: Geliang Tang <geliang.tang@suse.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

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

Posted by Matthieu Baerts 1 year, 8 months ago

Hi Geliang, Mat,

On 08/08/2022 03:44, Geliang Tang wrote:
> Move the fullmesh prefix test of addr_nr_ns2 together with its other
> prefix tests.

I'm glad to see you back!

Now in our tree (feat. for net-next) with Mat's RvB tag:

New patches for t/upstream:
- 1f2452544e4e: selftests: mptcp: move prefix tests of addr_nr_ns2 together
- Results: 8b0cb8f8874a..cb5660da7192 (export)


Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220809T163858

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

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

Posted by Mat Martineau 1 year, 8 months ago

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