Revert "selftests: net: amt: wait longer for connection before sending packets"

[PATCH 6.1.y] Revert "selftests: net: amt: wait longer for connection before sending packets"

Posted by Nathan Gao 1 month, 1 week ago

This reverts commit 7724036d4804222007689cd69f248347eb154793 which is
commit 04708606fd7bdc34b69089a4ff848ff36d7088f9 upstream.

The reverted patch introduced dependency on lib.sh under net selftests.
The file was introduced in v6.8-rc1 via commit 25ae948b4478
("selftests/net: add lib.sh").

Without lib.sh, the amt test fails with:
./amt.sh: line 76: source: lib.sh: file not found

The whole history of lib.sh includes about 50 commits and considering
the file never landed on 6.1 it may be better to not introduce it.

Signed-off-by: Nathan Gao <zcgao@amazon.com>
---
 tools/testing/selftests/net/amt.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/net/amt.sh b/tools/testing/selftests/net/amt.sh
index ea40b469a8c1..7e7ed6c558da 100755
--- a/tools/testing/selftests/net/amt.sh
+++ b/tools/testing/selftests/net/amt.sh
@@ -73,8 +73,6 @@
 #       +------------------------+
 #==============================================================================
 
-source lib.sh
-
 readonly LISTENER=$(mktemp -u listener-XXXXXXXX)
 readonly GATEWAY=$(mktemp -u gateway-XXXXXXXX)
 readonly RELAY=$(mktemp -u relay-XXXXXXXX)
@@ -242,15 +240,14 @@ test_ipv6_forward()
 
 send_mcast4()
 {
-	sleep 5
-	wait_local_port_listen ${LISTENER} 4000 udp
+	sleep 2
 	ip netns exec "${SOURCE}" bash -c \
 		'printf "%s %128s" 172.17.0.2 | nc -w 1 -u 239.0.0.1 4000' &
 }
 
 send_mcast6()
 {
-	wait_local_port_listen ${LISTENER} 6000 udp
+	sleep 2
 	ip netns exec "${SOURCE}" bash -c \
 		'printf "%s %128s" 2001:db8:3::2 | nc -w 1 -u ff0e::5:6 6000' &
 }
-- 
2.47.3

Re: [PATCH 6.1.y] Revert "selftests: net: amt: wait longer for connection before sending packets"

Posted by Taehee Yoo 1 month ago

On Tue, Mar 3, 2026 at 11:38 PM Nathan Gao <zcgao@amazon.com> wrote:
>

Hi Nathan,
Thank you so much for taking care of it.

> This reverts commit 7724036d4804222007689cd69f248347eb154793 which is
> commit 04708606fd7bdc34b69089a4ff848ff36d7088f9 upstream.
>
> The reverted patch introduced dependency on lib.sh under net selftests.
> The file was introduced in v6.8-rc1 via commit 25ae948b4478
> ("selftests/net: add lib.sh").
>
> Without lib.sh, the amt test fails with:
> ./amt.sh: line 76: source: lib.sh: file not found
>
> The whole history of lib.sh includes about 50 commits and considering
> the file never landed on 6.1 it may be better to not introduce it.
>
> Signed-off-by: Nathan Gao <zcgao@amazon.com>

Acked-by: Taehee Yoo <ap420073@gmail.com>

> ---
>  tools/testing/selftests/net/amt.sh | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/tools/testing/selftests/net/amt.sh b/tools/testing/selftests/net/amt.sh
> index ea40b469a8c1..7e7ed6c558da 100755
> --- a/tools/testing/selftests/net/amt.sh
> +++ b/tools/testing/selftests/net/amt.sh
> @@ -73,8 +73,6 @@
>  #       +------------------------+
>  #==============================================================================
>
> -source lib.sh
> -
>  readonly LISTENER=$(mktemp -u listener-XXXXXXXX)
>  readonly GATEWAY=$(mktemp -u gateway-XXXXXXXX)
>  readonly RELAY=$(mktemp -u relay-XXXXXXXX)
> @@ -242,15 +240,14 @@ test_ipv6_forward()
>
>  send_mcast4()
>  {
> -       sleep 5
> -       wait_local_port_listen ${LISTENER} 4000 udp
> +       sleep 2
>         ip netns exec "${SOURCE}" bash -c \
>                 'printf "%s %128s" 172.17.0.2 | nc -w 1 -u 239.0.0.1 4000' &
>  }
>
>  send_mcast6()
>  {
> -       wait_local_port_listen ${LISTENER} 6000 udp
> +       sleep 2
>         ip netns exec "${SOURCE}" bash -c \
>                 'printf "%s %128s" 2001:db8:3::2 | nc -w 1 -u ff0e::5:6 6000' &
>  }
> --
> 2.47.3
>