From: Matthieu Baerts <matttbe@kernel.org>
To: Geliang Tang <geliang@kernel.org>, mptcp@lists.linux.dev
Cc: Geliang Tang <tanggeliang@kylinos.cn>
Subject: Re: [PATCH mptcp-next] Squash to "selftests: mptcp: add last time actions tests"
Date: Fri, 29 Mar 2024 17:26:08 +0100 [thread overview]
Message-ID: <0ce6427e-7f48-410e-8db5-444f3b49d74f@kernel.org> (raw)
In-Reply-To: <d177c05847edc56a2bbc56d904a18cee8011a1ef.1711713371.git.tanggeliang@kylinos.cn>
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.
prev parent reply other threads:[~2024-03-29 16:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-29 11:56 [PATCH mptcp-next] Squash to "selftests: mptcp: add last time actions tests" Geliang Tang
2024-03-29 12:51 ` MPTCP CI
2024-03-29 16:26 ` Matthieu Baerts [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0ce6427e-7f48-410e-8db5-444f3b49d74f@kernel.org \
--to=matttbe@kernel.org \
--cc=geliang@kernel.org \
--cc=mptcp@lists.linux.dev \
--cc=tanggeliang@kylinos.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).