linux-kselftest.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Abeni <pabeni@redhat.com>
To: Jakub Kicinski <kuba@kernel.org>, davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, shuah@kernel.org,
	 ap420073@gmail.com, linux-kselftest@vger.kernel.org
Subject: Re: [PATCH net] selftests: net: move amt to socat for better compatibility
Date: Thu, 09 May 2024 19:39:36 +0200	[thread overview]
Message-ID: <0bf4989c10917b2351636a2f19794e47f3d336e9.camel@redhat.com> (raw)
In-Reply-To: <20240509161952.3940476-1-kuba@kernel.org>

On Thu, 2024-05-09 at 09:19 -0700, Jakub Kicinski wrote:
> The test seems to expect that nc will exit after the first
> received message. This is not the case with Ncat 7.94.
> There are multiple versions of nc out there, switch
> to socat for better compatibility.
> 
> Tell socat to exit after 128 bytes and pad the message.
> 
> Since the test sets -e make sure we don't set exit code
> (|| true) and print the pass / fail rather then silently
> moving over the test and just setting non-zero exit code
> with no output indicating what failed.
> 
> Fixes: c08e8baea78e ("selftests: add amt interface selftest script")
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
> CC: shuah@kernel.org
> CC: ap420073@gmail.com
> CC: linux-kselftest@vger.kernel.org
> ---
>  tools/testing/selftests/net/amt.sh | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/tools/testing/selftests/net/amt.sh b/tools/testing/selftests/net/amt.sh
> index 75528788cb95..5175a42cbe8a 100755
> --- a/tools/testing/selftests/net/amt.sh
> +++ b/tools/testing/selftests/net/amt.sh
> @@ -210,8 +210,8 @@ check_features()
>  
>  test_ipv4_forward()
>  {
> -	RESULT4=$(ip netns exec "${LISTENER}" nc -w 1 -l -u 239.0.0.1 4000)
> -	if [ "$RESULT4" == "172.17.0.2" ]; then
> +	RESULT4=$(ip netns exec "${LISTENER}" timeout 15 socat - UDP4-LISTEN:4000,readbytes=128 || true)
> +	if echo "$RESULT4" | grep -q "172.17.0.2"; then
>  		printf "TEST: %-60s  [ OK ]\n" "IPv4 amt multicast forwarding"
>  		exit 0
>  	else
> @@ -222,8 +222,8 @@ test_ipv4_forward()
>  
>  test_ipv6_forward()
>  {
> -	RESULT6=$(ip netns exec "${LISTENER}" nc -w 1 -l -u ff0e::5:6 6000)
> -	if [ "$RESULT6" == "2001:db8:3::2" ]; then
> +	RESULT6=$(ip netns exec "${LISTENER}" timeout 15 socat - UDP6-LISTEN:6000,readbytes=128 || true)
> +	if echo "$RESULT6" | grep -q "2001:db8:3::2"; then

The patch LGTM:

Acked-by: Paolo Abeni<pabeni@redhat.com>

As a minor note, shell variable expansion should already trim all the
trailing/leading spaces from the socat command output, so it should not
be necessary replace the string comparison with the grep command:

	RESULT6=$(ip netns exec "${LISTENER}" timeout 15 socat - UDP6-LISTEN:6000,readbytes=128 || true)
	if [ "$RESULT6" == "2001:db8:3::2" ]; then

Should work

Cheers,

Paolo


  reply	other threads:[~2024-05-09 17:39 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-09 16:19 [PATCH net] selftests: net: move amt to socat for better compatibility Jakub Kicinski
2024-05-09 17:39 ` Paolo Abeni [this message]
2024-05-09 18:42   ` Jakub Kicinski
2024-05-10  6:09 ` Taehee Yoo
2024-05-11  1:30 ` patchwork-bot+netdevbpf

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=0bf4989c10917b2351636a2f19794e47f3d336e9.camel@redhat.com \
    --to=pabeni@redhat.com \
    --cc=ap420073@gmail.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=kuba@kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=shuah@kernel.org \
    /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 NNTP newsgroup(s).