Squash-to: "selftests: mptcp: more stable diag tests"

[PATCH mptcp-net] Squash-to: "selftests: mptcp: more stable diag tests"

Posted by Paolo Abeni 3 years, 7 months ago

The "....chk remote_key" testcase is failing quite often in debug
build. I guess the mptcp_connect completes before the script execute
this latter test, so I'm adding another large wait. It should not
impact the test run-time, as the mptcp_connect processes are terminated
just after running the check.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
this is wild guess, mostly to trigger/inspect the test results
---
 tools/testing/selftests/net/mptcp/diag.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index ee2f238255ec..515859a5168b 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -179,7 +179,7 @@ ip -n $ns link set dev lo up
 echo "a" | \
 	timeout ${timeout_test} \
 		ip netns exec $ns \
-			./mptcp_connect -p 10000 -l -t ${timeout_poll} \
+			./mptcp_connect -p 10000 -l -t ${timeout_poll} -w 20 \
 				0.0.0.0 >/dev/null &
 wait_local_port_listen $ns 10000
 chk_msk_nr 0 "no msk on netns creation"
@@ -188,7 +188,7 @@ chk_msk_listen 10000
 echo "b" | \
 	timeout ${timeout_test} \
 		ip netns exec $ns \
-			./mptcp_connect -p 10000 -r 0 -t ${timeout_poll} \
+			./mptcp_connect -p 10000 -r 0 -t ${timeout_poll} -w 20 \
 				127.0.0.1 >/dev/null &
 wait_connected $ns 10000
 chk_msk_nr 2 "after MPC handshake "
@@ -200,13 +200,13 @@ flush_pids
 echo "a" | \
 	timeout ${timeout_test} \
 		ip netns exec $ns \
-			./mptcp_connect -p 10001 -l -s TCP -t ${timeout_poll} \
+			./mptcp_connect -p 10001 -l -s TCP -t ${timeout_poll} -w 20 \
 				0.0.0.0 >/dev/null &
 wait_local_port_listen $ns 10001
 echo "b" | \
 	timeout ${timeout_test} \
 		ip netns exec $ns \
-			./mptcp_connect -p 10001 -r 0 -t ${timeout_poll} \
+			./mptcp_connect -p 10001 -r 0 -t ${timeout_poll} -w 20 \
 				127.0.0.1 >/dev/null &
 wait_connected $ns 10001
 chk_msk_fallback_nr 1 "check fallback"
-- 
2.35.3

Re: [PATCH mptcp-net] Squash-to: "selftests: mptcp: more stable diag tests"

Posted by Matthieu Baerts 3 years, 7 months ago

Hi Paolo, Mat,

On 22/06/2022 11:47, Paolo Abeni wrote:
> The "....chk remote_key" testcase is failing quite often in debug
> build. I guess the mptcp_connect completes before the script execute
> this latter test, so I'm adding another large wait. It should not
> impact the test run-time, as the mptcp_connect processes are terminated
> just after running the check.

Thank you for the patch and the review!

New patches for t/upstream-net:
- c15701ca49c2: "squashed" in "selftests: mptcp: more stable diag tests"
- Results: 7db03aa2d67f..66322cb76048 (export-net)

New patches for t/upstream:
- c15701ca49c2: "squashed" in "selftests: mptcp: more stable diag tests"
- Results: cbb1cc653035..23a79309dbdb (export)


Builds and tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export-net/20220622T211409
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export-net

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220622T211409
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export


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

Re: [PATCH mptcp-net] Squash-to: "selftests: mptcp: more stable diag tests"

Posted by Mat Martineau 3 years, 7 months ago

On Wed, 22 Jun 2022, Paolo Abeni wrote:

> The "....chk remote_key" testcase is failing quite often in debug
> build. I guess the mptcp_connect completes before the script execute
> this latter test, so I'm adding another large wait. It should not
> impact the test run-time, as the mptcp_connect processes are terminated
> just after running the check.
>
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> ---
> this is wild guess, mostly to trigger/inspect the test results

Looks good to squash - CI looks ok too.

- Mat


> ---
> tools/testing/selftests/net/mptcp/diag.sh | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
> index ee2f238255ec..515859a5168b 100755
> --- a/tools/testing/selftests/net/mptcp/diag.sh
> +++ b/tools/testing/selftests/net/mptcp/diag.sh
> @@ -179,7 +179,7 @@ ip -n $ns link set dev lo up
> echo "a" | \
> 	timeout ${timeout_test} \
> 		ip netns exec $ns \
> -			./mptcp_connect -p 10000 -l -t ${timeout_poll} \
> +			./mptcp_connect -p 10000 -l -t ${timeout_poll} -w 20 \
> 				0.0.0.0 >/dev/null &
> wait_local_port_listen $ns 10000
> chk_msk_nr 0 "no msk on netns creation"
> @@ -188,7 +188,7 @@ chk_msk_listen 10000
> echo "b" | \
> 	timeout ${timeout_test} \
> 		ip netns exec $ns \
> -			./mptcp_connect -p 10000 -r 0 -t ${timeout_poll} \
> +			./mptcp_connect -p 10000 -r 0 -t ${timeout_poll} -w 20 \
> 				127.0.0.1 >/dev/null &
> wait_connected $ns 10000
> chk_msk_nr 2 "after MPC handshake "
> @@ -200,13 +200,13 @@ flush_pids
> echo "a" | \
> 	timeout ${timeout_test} \
> 		ip netns exec $ns \
> -			./mptcp_connect -p 10001 -l -s TCP -t ${timeout_poll} \
> +			./mptcp_connect -p 10001 -l -s TCP -t ${timeout_poll} -w 20 \
> 				0.0.0.0 >/dev/null &
> wait_local_port_listen $ns 10001
> echo "b" | \
> 	timeout ${timeout_test} \
> 		ip netns exec $ns \
> -			./mptcp_connect -p 10001 -r 0 -t ${timeout_poll} \
> +			./mptcp_connect -p 10001 -r 0 -t ${timeout_poll} -w 20 \
> 				127.0.0.1 >/dev/null &
> wait_connected $ns 10001
> chk_msk_fallback_nr 1 "check fallback"
> -- 
> 2.35.3
>
>
>

--
Mat Martineau
Intel