[PATCH nft] tests: shell: fix spurious dump failure in vmap timeout test

[PATCH nft] tests: shell: fix spurious dump failure in vmap timeout test

[Florian Westphal]

Blamed commit can update the timeout to 6s, but last line waits
for 5 seconds and expects that to be enough to have all elements vanish.

Fix the typo to limit update timeout also to 5 seconds and not 6.
This fixes spurious dump failures like this one:

-               elements = { 1.2.3.4 . 22 : jump ssh_input }
+               elements = { 1.2.3.4 . 22 : jump ssh_input,
+                            10.0.95.144 . 38023 timeout 6s expires 545ms : jump other_input }

Fixes: db80037c0279 ("tests: shell: extend vmap test with updates")
Signed-off-by: Florian Westphal <fw@strlen.de>
---
 tests/shell/testcases/maps/vmap_timeout | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/shell/testcases/maps/vmap_timeout b/tests/shell/testcases/maps/vmap_timeout
index 3f0563afacac..6d73f3cc9ae2 100755
--- a/tests/shell/testcases/maps/vmap_timeout
+++ b/tests/shell/testcases/maps/vmap_timeout
@@ -32,7 +32,7 @@ for i in $(seq 1 100) ; do
 		timeout=$((timeout+1))
 		expire=$((RANDOM%timeout))
 		utimeout=$((RANDOM%5))
-		utimeout=$((timeout+1))
+		utimeout=$((utimeout+1))
 
 		timeout_str="timeout ${timeout}s"
 		expire_str=""
-- 
2.45.2

Re: [PATCH nft] tests: shell: fix spurious dump failure in vmap timeout test

[Phil Sutter]

On Fri, Oct 11, 2024 at 02:32:08AM +0200, Florian Westphal wrote:
> Blamed commit can update the timeout to 6s, but last line waits
> for 5 seconds and expects that to be enough to have all elements vanish.
> 
> Fix the typo to limit update timeout also to 5 seconds and not 6.
> This fixes spurious dump failures like this one:
> 
> -               elements = { 1.2.3.4 . 22 : jump ssh_input }
> +               elements = { 1.2.3.4 . 22 : jump ssh_input,
> +                            10.0.95.144 . 38023 timeout 6s expires 545ms : jump other_input }
> 
> Fixes: db80037c0279 ("tests: shell: extend vmap test with updates")
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
>  tests/shell/testcases/maps/vmap_timeout | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/shell/testcases/maps/vmap_timeout b/tests/shell/testcases/maps/vmap_timeout
> index 3f0563afacac..6d73f3cc9ae2 100755
> --- a/tests/shell/testcases/maps/vmap_timeout
> +++ b/tests/shell/testcases/maps/vmap_timeout
> @@ -32,7 +32,7 @@ for i in $(seq 1 100) ; do
>  		timeout=$((timeout+1))
>  		expire=$((RANDOM%timeout))
>  		utimeout=$((RANDOM%5))
> -		utimeout=$((timeout+1))
> +		utimeout=$((utimeout+1))

How about merging the statements?

| utimeout=$((RANDOM % 5 + 1))

This applies to three spots in total.

Cheers, Phil

Re: [PATCH nft] tests: shell: fix spurious dump failure in vmap timeout test

[Florian Westphal]

Phil Sutter <phil@nwl.cc> wrote:
> >  		utimeout=$((RANDOM%5))
> > -		utimeout=$((timeout+1))
> > +		utimeout=$((utimeout+1))
> 
> How about merging the statements?
>
> | utimeout=$((RANDOM % 5 + 1))

Sure, that works too.  I applied the patch as-is, you can munge this as
a followup if you like.