From: Geliang Tang <geliang@kernel.org>
To: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>, mptcp@lists.linux.dev
Subject: Re: [PATCH mptcp-next v3 6/8] selftests: mptcp: join: more explicit check name
Date: Fri, 09 Aug 2024 10:00:57 +0800 [thread overview]
Message-ID: <4a12b5efddb6f09308e0f442feac7ae613eaa28b.camel@kernel.org> (raw)
In-Reply-To: <20240806-mptcp-join-tx-mib-v3-6-c3b54d2099e9@kernel.org>
On Tue, 2024-08-06 at 13:18 +0200, Matthieu Baerts (NGI0) wrote:
> Before, the check names had to be very short. It is no longer the
> case
> now that these checks are printed on a dedicated line.
>
> Then, it looks better to have more explicit names.
>
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> ---
> tools/testing/selftests/net/mptcp/mptcp_join.sh | 59 +++++++++++++--
> ----------
> 1 file changed, 30 insertions(+), 29 deletions(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> index 23ea8acb7a36..46e8e43c4a54 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> @@ -856,7 +856,7 @@ chk_cestab_nr()
> local cestab=$2
> local count
>
> - print_check "cestab $cestab"
> + print_check "currently established: $cestab"
> count=$(mptcp_lib_get_counter ${ns} "MPTcpExtMPCurrEstab")
> if [ -z "$count" ]; then
> print_skip
> @@ -1132,7 +1132,7 @@ chk_csum_nr()
> csum_ns2=${csum_ns2:1}
> fi
>
> - print_check "sum"
> + print_check "checksum server"
> count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtDataCsumErr")
> if [ -n "$count" ] && [ "$count" != "$csum_ns1" ]; then
> extra_msg+=" ns1=$count"
> @@ -1145,7 +1145,8 @@ chk_csum_nr()
> else
> print_ok
> fi
> - print_check "csum"
> +
> + print_check "checksum client"
> count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtDataCsumErr")
> if [ -n "$count" ] && [ "$count" != "$csum_ns2" ]; then
> extra_msg+=" ns2=$count"
> @@ -1189,7 +1190,7 @@ chk_fail_nr()
> fail_rx=${fail_rx:1}
> fi
>
> - print_check "ftx"
> + print_check "fail tx"
> count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPFailTx")
> if [ -n "$count" ] && [ "$count" != "$fail_tx" ]; then
> extra_msg+=",tx=$count"
> @@ -1203,7 +1204,7 @@ chk_fail_nr()
> print_ok
> fi
>
> - print_check "failrx"
> + print_check "fail rx"
> count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPFailRx")
> if [ -n "$count" ] && [ "$count" != "$fail_rx" ]; then
> extra_msg+=",rx=$count"
> @@ -1236,7 +1237,7 @@ chk_fclose_nr()
> extra_msg="invert"
> fi
>
> - print_check "ctx"
> + print_check "fast close tx"
> count=$(mptcp_lib_get_counter ${ns_tx}
> "MPTcpExtMPFastcloseTx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1247,7 +1248,7 @@ chk_fclose_nr()
> print_ok
> fi
>
> - print_check "fclzrx"
> + print_check "fast close rx"
> count=$(mptcp_lib_get_counter ${ns_rx}
> "MPTcpExtMPFastcloseRx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1277,7 +1278,7 @@ chk_rst_nr()
> extra_msg="invert"
> fi
>
> - print_check "rtx"
> + print_check "reset tx"
> count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPRstTx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1289,7 +1290,7 @@ chk_rst_nr()
> print_ok
> fi
>
> - print_check "rstrx"
> + print_check "reset rx"
> count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPRstRx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1310,7 +1311,7 @@ chk_infi_nr()
> local infi_rx=$2
> local count
>
> - print_check "itx"
> + print_check "infi tx"
> count=$(mptcp_lib_get_counter ${ns2}
> "MPTcpExtInfiniteMapTx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1320,7 +1321,7 @@ chk_infi_nr()
> print_ok
> fi
>
> - print_check "infirx"
> + print_check "infi rx"
> count=$(mptcp_lib_get_counter ${ns1}
> "MPTcpExtInfiniteMapRx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1403,7 +1404,7 @@ chk_join_nr()
> rc=${KSFT_SKIP}
> elif [ "$count" != "$syn_nr" ]; then
> rc=${KSFT_FAIL}
> - print_check "syn"
> + print_check "syn rx"
> fail_test "got $count JOIN[s] syn expected $syn_nr"
I think it's better to update fail_test messages too:
fail_test "got $count JOIN[s] syn rx expected $syn_nr"
> fi
>
> @@ -1417,7 +1418,7 @@ chk_join_nr()
> # the subflow creation
> if [ "$with_cookie" != 2 ] || [ "$count" -le
> "$syn_ack_nr" ] || [ "$count" -gt "$syn_nr" ]; then
> rc=${KSFT_FAIL}
> - print_check "synack"
> + print_check "synack rx"
> fail_test "got $count JOIN[s] synack
> expected $syn_ack_nr"
Same here:
fail_test "got $count JOIN[s] synack rx expected $syn_ack_nr"
> fi
> fi
> @@ -1427,7 +1428,7 @@ chk_join_nr()
> rc=${KSFT_SKIP}
> elif [ "$count" != "$ack_nr" ]; then
> rc=${KSFT_FAIL}
> - print_check "ack"
> + print_check "ack rx"
> fail_test "got $count JOIN[s] ack expected $ack_nr"
And here:
fail_test "got $count JOIN[s] ack rx expected $ack_nr"
> fi
>
> @@ -1507,7 +1508,7 @@ chk_add_nr()
>
> timeout=$(ip netns exec ${ns_tx} sysctl -n
> net.mptcp.add_addr_timeout)
>
> - print_check "add"
> + print_check "add addr rx"
> count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtAddAddr")
> if [ -z "$count" ]; then
> print_skip
> @@ -1519,7 +1520,7 @@ chk_add_nr()
> print_ok
> fi
>
> - print_check "echo"
> + print_check "add addr echo rx"
> count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtEchoAdd")
> if [ -z "$count" ]; then
> print_skip
> @@ -1530,7 +1531,7 @@ chk_add_nr()
> fi
>
> if [ $port_nr -gt 0 ]; then
> - print_check "pt"
> + print_check "add addr rx with port"
> count=$(mptcp_lib_get_counter ${ns_rx}
> "MPTcpExtPortAdd")
> if [ -z "$count" ]; then
> print_skip
> @@ -1540,7 +1541,7 @@ chk_add_nr()
> print_ok
> fi
>
> - print_check "syn"
> + print_check "syn rx port"
> count=$(mptcp_lib_get_counter ${ns_tx}
> "MPTcpExtMPJoinPortSynRx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1551,7 +1552,7 @@ chk_add_nr()
> print_ok
> fi
>
> - print_check "synack"
> + print_check "synack rx port"
> count=$(mptcp_lib_get_counter ${ns_rx}
> "MPTcpExtMPJoinPortSynAckRx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1562,7 +1563,7 @@ chk_add_nr()
> print_ok
> fi
>
> - print_check "ack"
> + print_check "ack rx port"
> count=$(mptcp_lib_get_counter ${ns_tx}
> "MPTcpExtMPJoinPortAckRx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1573,7 +1574,7 @@ chk_add_nr()
> print_ok
> fi
>
> - print_check "syn"
> + print_check "syn rx port mismatch"
> count=$(mptcp_lib_get_counter ${ns_tx}
> "MPTcpExtMismatchPortSynRx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1584,7 +1585,7 @@ chk_add_nr()
> print_ok
> fi
>
> - print_check "ack"
> + print_check "ack rx port mismatch"
> count=$(mptcp_lib_get_counter ${ns_tx}
> "MPTcpExtMismatchPortAckRx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1608,7 +1609,7 @@ chk_add_tx_nr()
>
> timeout=$(ip netns exec $ns1 sysctl -n
> net.mptcp.add_addr_timeout)
>
> - print_check "add TX"
> + print_check "add addr tx"
> count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtAddAddrTx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1620,7 +1621,7 @@ chk_add_tx_nr()
> print_ok
> fi
>
> - print_check "echo TX"
> + print_check "add addr echo tx"
> count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtEchoAddTx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1658,7 +1659,7 @@ chk_rm_nr()
> extra_msg="invert"
> fi
>
> - print_check "rm"
> + print_check "rm addr rx"
> count=$(mptcp_lib_get_counter ${addr_ns} "MPTcpExtRmAddr")
> if [ -z "$count" ]; then
> print_skip
> @@ -1668,7 +1669,7 @@ chk_rm_nr()
> print_ok
> fi
>
> - print_check "rmsf"
> + print_check "rm subflow"
> count=$(mptcp_lib_get_counter ${subflow_ns}
> "MPTcpExtRmSubflow")
> if [ -z "$count" ]; then
> print_skip
> @@ -1703,7 +1704,7 @@ chk_rm_tx_nr()
> {
> local rm_addr_tx_nr=$1
>
> - print_check "rm TX"
> + print_check "rm addr tx"
> count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtRmAddrTx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1722,7 +1723,7 @@ chk_prio_nr()
> local mpj_syn_ack=$4
> local count
>
> - print_check "ptx"
> + print_check "mp_prio tx"
> count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPPrioTx")
> if [ -z "$count" ]; then
> print_skip
> @@ -1732,7 +1733,7 @@ chk_prio_nr()
> print_ok
> fi
>
> - print_check "prx"
> + print_check "mp_prio rx"
> count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPPrioRx")
> if [ -z "$count" ]; then
> print_skip
>
next prev parent reply other threads:[~2024-08-09 2:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-06 11:18 [PATCH mptcp-next v3 0/8] mptcp: MIB counters for sent MP_JOIN Matthieu Baerts (NGI0)
2024-08-06 11:18 ` [PATCH mptcp-next v3 1/8] selftests: mptcp: join: no extra msg if no counter Matthieu Baerts (NGI0)
2024-08-08 2:38 ` Geliang Tang
2024-08-08 10:17 ` Matthieu Baerts
2024-08-09 2:30 ` Geliang Tang
2024-08-09 11:32 ` Matthieu Baerts
2024-08-09 11:52 ` Geliang Tang
2024-08-06 11:18 ` [PATCH mptcp-next v3 2/8] mptcp: MIB counters for sent MP_JOIN Matthieu Baerts (NGI0)
2024-08-08 2:46 ` Geliang Tang
2024-08-08 10:18 ` Matthieu Baerts
2024-08-06 11:18 ` [PATCH mptcp-next v3 3/8] selftests: mptcp: join: reduce join_nr params Matthieu Baerts (NGI0)
2024-08-08 3:28 ` Geliang Tang
2024-08-08 10:22 ` Matthieu Baerts
2024-08-09 2:32 ` Geliang Tang
2024-08-06 11:18 ` [PATCH mptcp-next v3 4/8] selftests: mptcp: join: one line for join check Matthieu Baerts (NGI0)
2024-08-09 2:10 ` Geliang Tang
2024-08-09 11:39 ` Matthieu Baerts
2024-08-06 11:18 ` [PATCH mptcp-next v3 5/8] selftests: mptcp: join: validate MPJ SYN TX MIB counters Matthieu Baerts (NGI0)
2024-08-09 2:21 ` Geliang Tang
2024-08-09 11:42 ` Matthieu Baerts
2024-08-06 11:18 ` [PATCH mptcp-next v3 6/8] selftests: mptcp: join: more explicit check name Matthieu Baerts (NGI0)
2024-08-09 2:00 ` Geliang Tang [this message]
2024-08-06 11:18 ` [PATCH mptcp-next v3 7/8] selftests: mptcp: join: specify host being checked Matthieu Baerts (NGI0)
2024-08-06 11:18 ` [PATCH mptcp-next v3 8/8] selftests: mptcp: join: mute errors when ran in the background Matthieu Baerts (NGI0)
2024-08-06 12:08 ` [PATCH mptcp-next v3 0/8] mptcp: MIB counters for sent MP_JOIN MPTCP CI
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=4a12b5efddb6f09308e0f442feac7ae613eaa28b.camel@kernel.org \
--to=geliang@kernel.org \
--cc=matttbe@kernel.org \
--cc=mptcp@lists.linux.dev \
/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