[PATCH mptcp-next 3/3] selftests: mptcp: Rename wait function

Mat Martineau posted 3 patches 3 years, 11 months ago
[PATCH mptcp-next 3/3] selftests: mptcp: Rename wait function
Posted by Mat Martineau 3 years, 11 months ago
The "selftests: mptcp: improve 'fair usage on close' stability" commit
changed that self test to check the TcpAttemptFails MIB instead of
looking for TW sockets. The associated bash function wasn't renamed in
that commit because of the merge conflicts it would cause, so this
commit updates the function name as Paolo originally intended.

Cc: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 491934c3c489..71b2ad5adefc 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -1152,7 +1152,7 @@ chk_link_usage()
 	fi
 }
 
-wait_for_tw()
+wait_attempt_fail()
 {
 	local timeout_ms=$((timeout_poll * 1000))
 	local time=0
@@ -1271,7 +1271,7 @@ subflows_error_tests()
 	TEST_COUNT=$((TEST_COUNT+1))
 
 	# mpj subflow will be in TW after the reset
-	wait_for_tw $ns2
+	wait_attempt_fail $ns2
 	pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
 	wait
 
-- 
2.35.1


Re: [PATCH mptcp-next 3/3] selftests: mptcp: Rename wait function
Posted by Paolo Abeni 3 years, 11 months ago
Hello,

On Fri, 2022-02-18 at 14:18 -0800, Mat Martineau wrote:
> The "selftests: mptcp: improve 'fair usage on close' stability" commit
> changed that self test to check the TcpAttemptFails MIB instead of
> looking for TW sockets. The associated bash function wasn't renamed in
> that commit because of the merge conflicts it would cause, so this
> commit updates the function name as Paolo originally intended.
> 
> Cc: Paolo Abeni <pabeni@redhat.com>
> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
> ---
>  tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> index 491934c3c489..71b2ad5adefc 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> @@ -1152,7 +1152,7 @@ chk_link_usage()
>  	fi
>  }
>  
> -wait_for_tw()
> +wait_attempt_fail()
>  {
>  	local timeout_ms=$((timeout_poll * 1000))
>  	local time=0
> @@ -1271,7 +1271,7 @@ subflows_error_tests()
>  	TEST_COUNT=$((TEST_COUNT+1))
>  
>  	# mpj subflow will be in TW after the reset
> -	wait_for_tw $ns2
> +	wait_attempt_fail $ns2
>  	pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
>  	wait
> 
I'm late here, sorry.

I'm ok with the patch as is.

Thanks!

Paolo