[nft PATCH] tests: shell: Fix bogus testsuite failure with 250Hz

[nft PATCH] tests: shell: Fix bogus testsuite failure with 250Hz

[Phil Sutter]

Previous fix for HZ=100 was not sufficient, a kernel with HZ=250 rounds
the 10ms to 8ms it seems. Do as Lukas suggests and accept the occasional
input/output asymmetry instead of continuing the hide'n'seek game.

Fixes: c9c5b5f621c37 ("tests: shell: Fix bogus testsuite failure with 100Hz")
Suggested-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 tests/shell/testcases/sets/0031set_timeout_size_0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/shell/testcases/sets/0031set_timeout_size_0 b/tests/shell/testcases/sets/0031set_timeout_size_0
index 796640d64670a..9a4a27f6c4512 100755
--- a/tests/shell/testcases/sets/0031set_timeout_size_0
+++ b/tests/shell/testcases/sets/0031set_timeout_size_0
@@ -8,5 +8,5 @@ add rule x test set update ip daddr timeout 100ms @y"
 
 set -e
 $NFT -f - <<< "$RULESET"
-$NFT list chain x test | grep -q 'update @y { ip saddr timeout 1d2h3m4s10ms }'
+$NFT list chain x test | grep -q 'update @y { ip saddr timeout 1d2h3m4s\(10\|8\)ms }'
 $NFT list chain x test | grep -q 'update @y { ip daddr timeout 100ms }'
-- 
2.33.0

Re: [nft PATCH] tests: shell: Fix bogus testsuite failure with 250Hz

[Pablo Neira Ayuso]

On Tue, Nov 02, 2021 at 09:07:53PM +0100, Phil Sutter wrote:
> Previous fix for HZ=100 was not sufficient, a kernel with HZ=250 rounds
> the 10ms to 8ms it seems. Do as Lukas suggests and accept the occasional
> input/output asymmetry instead of continuing the hide'n'seek game.
> 
> Fixes: c9c5b5f621c37 ("tests: shell: Fix bogus testsuite failure with 100Hz")
> Suggested-by: Lukas Wunner <lukas@wunner.de>
> Signed-off-by: Phil Sutter <phil@nwl.cc>

ACK

> ---
>  tests/shell/testcases/sets/0031set_timeout_size_0 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/shell/testcases/sets/0031set_timeout_size_0 b/tests/shell/testcases/sets/0031set_timeout_size_0
> index 796640d64670a..9a4a27f6c4512 100755
> --- a/tests/shell/testcases/sets/0031set_timeout_size_0
> +++ b/tests/shell/testcases/sets/0031set_timeout_size_0
> @@ -8,5 +8,5 @@ add rule x test set update ip daddr timeout 100ms @y"
>  
>  set -e
>  $NFT -f - <<< "$RULESET"
> -$NFT list chain x test | grep -q 'update @y { ip saddr timeout 1d2h3m4s10ms }'
> +$NFT list chain x test | grep -q 'update @y { ip saddr timeout 1d2h3m4s\(10\|8\)ms }'
>  $NFT list chain x test | grep -q 'update @y { ip daddr timeout 100ms }'
> -- 
> 2.33.0
> 

Re: [nft PATCH] tests: shell: Fix bogus testsuite failure with 250Hz

[Lukas Wunner]

On Tue, Nov 02, 2021 at 09:07:53PM +0100, Phil Sutter wrote:
> Previous fix for HZ=100 was not sufficient, a kernel with HZ=250 rounds
> the 10ms to 8ms it seems. Do as Lukas suggests and accept the occasional
> input/output asymmetry instead of continuing the hide'n'seek game.
[...]
> --- a/tests/shell/testcases/sets/0031set_timeout_size_0
> +++ b/tests/shell/testcases/sets/0031set_timeout_size_0
> @@ -8,5 +8,5 @@ add rule x test set update ip daddr timeout 100ms @y"
>  
>  set -e
>  $NFT -f - <<< "$RULESET"
> -$NFT list chain x test | grep -q 'update @y { ip saddr timeout 1d2h3m4s10ms }'
> +$NFT list chain x test | grep -q 'update @y { ip saddr timeout 1d2h3m4s\(10\|8\)ms }'
>  $NFT list chain x test | grep -q 'update @y { ip daddr timeout 100ms }'

Thanks, LGTM.

(The backslashes preceding the ( | ) characters could be avoided with
grep -E, but that's just a matter of personal preference.)