Squash to "selftests: mptcp: add last time actions tests"

[PATCH mptcp-next] Squash to "selftests: mptcp: add last time actions tests"

Posted by Geliang Tang 1 year, 10 months ago

From: Geliang Tang <tanggeliang@kylinos.cn>

Update chk_msk_info with mptcp_lib_pr_fail.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 tools/testing/selftests/net/mptcp/diag.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index 6e865f95f85e..aa1cdfb176db 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -211,12 +211,16 @@ chk_msk_info()
 		cnt2=$(ss -N ${ns} -inmHM | mptcp_lib_get_info_value "$info" "$info")
 		msg="....chk ${info:0:15}=$cnt1:$cnt2"
 		mptcp_lib_print_title "${msg}"
-		if [ "${cnt1}" -lt "${cnt2}" ]; then
+		if [ -z "${cnt1}" ] || [ -z "${cnt2}" ]; then
+			mptcp_lib_pr_skip "Feature probably not supported"
+			mptcp_lib_result_skip "${msg}"
+		elif [ "${cnt1}" -lt "${cnt2}" ]; then
 			mptcp_lib_pr_ok
 			mptcp_lib_result_pass "${msg}"
 		else
-			mptcp_lib_pr_skip
-			mptcp_lib_result_skip "${msg}"
+			mptcp_lib_pr_fail "expected $cnt1 < $cnt2"
+			mptcp_lib_result_fail "${msg}"
+			ret=${KSFT_FAIL}
 		fi
 	done
 }
-- 
2.40.1

Re: [PATCH mptcp-next] Squash to "selftests: mptcp: add last time actions tests"

Posted by Matthieu Baerts 1 year, 10 months ago

Hi Geliang,

On 29/03/2024 12:56, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> Update chk_msk_info with mptcp_lib_pr_fail.
> 
> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> ---
>  tools/testing/selftests/net/mptcp/diag.sh | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
> index 6e865f95f85e..aa1cdfb176db 100755
> --- a/tools/testing/selftests/net/mptcp/diag.sh
> +++ b/tools/testing/selftests/net/mptcp/diag.sh
> @@ -211,12 +211,16 @@ chk_msk_info()
>  		cnt2=$(ss -N ${ns} -inmHM | mptcp_lib_get_info_value "$info" "$info")
>  		msg="....chk ${info:0:15}=$cnt1:$cnt2"
>  		mptcp_lib_print_title "${msg}"
> -		if [ "${cnt1}" -lt "${cnt2}" ]; then
> +		if [ -z "${cnt1}" ] || [ -z "${cnt2}" ]; then

Here, you should have:

  if { [ -z "${cnt1}" ] || [ -z "${cnt2}" ]; } &&
     ! mptcp_lib_expect_all_features; then

Because our CI should fail if the failure is not available [1].

I understand that it means the test will fail if we don't use IPRoute2
with your suggested patch, but that's normal: when applying this series,
we can modify the CI docker image to include this support this new feature.


[1] Because only our CI has SELFTESTS_MPTCP_LIB_EXPECT_ALL_FEATURES=1

> +			mptcp_lib_pr_skip "Feature probably not supported"
> +			mptcp_lib_result_skip "${msg}"
> +		elif [ "${cnt1}" -lt "${cnt2}" ]; then
>  			mptcp_lib_pr_ok
>  			mptcp_lib_result_pass "${msg}"
>  		else
> -			mptcp_lib_pr_skip
> -			mptcp_lib_result_skip "${msg}"
> +			mptcp_lib_pr_fail "expected $cnt1 < $cnt2"
> +			mptcp_lib_result_fail "${msg}"
> +			ret=${KSFT_FAIL}
>  		fi
>  	done
>  }

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.