From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E2D1E732DB for ; Thu, 28 Sep 2023 14:58:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231294AbjI1O6u (ORCPT ); Thu, 28 Sep 2023 10:58:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230430AbjI1O6u (ORCPT ); Thu, 28 Sep 2023 10:58:50 -0400 Received: from orbyte.nwl.cc (orbyte.nwl.cc [IPv6:2001:41d0:e:133a::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97C3119E for ; Thu, 28 Sep 2023 07:58:48 -0700 (PDT) Received: from n0-1 by orbyte.nwl.cc with local (Exim 4.94.2) (envelope-from ) id 1qlsTW-0003Uo-LK; Thu, 28 Sep 2023 16:58:46 +0200 Date: Thu, 28 Sep 2023 16:58:46 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: Re: [PATCH nft,v3] tests: shell: fix spurious errors in sets/0036add_set_element_expiration_0 Message-ID: Mail-Followup-To: Phil Sutter , Pablo Neira Ayuso , netfilter-devel@vger.kernel.org References: <20230927163937.757167-1-pablo@netfilter.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230927163937.757167-1-pablo@netfilter.org> Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Wed, Sep 27, 2023 at 06:39:37PM +0200, Pablo Neira Ayuso wrote: > A number of changes to fix spurious errors: > > - Add seconds as expiration, otherwise 14m59 reports 14m in minute > granularity, this ensures suficient time in a very slow environment with > debugging instrumentation. > > - Provide expected output. > > - Update sed regular expression to make 'ms' optional and use -E mode. > > Fixes: adf38fd84257 ("tests: shell: use minutes granularity in sets/0036add_set_element_expiration_0") > Signed-off-by: Pablo Neira Ayuso > --- > v3: - [ "$test_output" != "$EXPECTED" ], not [ "$test_output" != "$RULESET" ] > - Make 'ms' optional in sed regular expression > - Use -E in sed > > .../testcases/sets/0036add_set_element_expiration_0 | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/tests/shell/testcases/sets/0036add_set_element_expiration_0 b/tests/shell/testcases/sets/0036add_set_element_expiration_0 > index 12f10074409f..0fd016e9f857 100755 > --- a/tests/shell/testcases/sets/0036add_set_element_expiration_0 > +++ b/tests/shell/testcases/sets/0036add_set_element_expiration_0 > @@ -3,17 +3,21 @@ > set -e > > drop_seconds() { > - sed 's/m[0-9]*s[0-9]*ms/m/g' > + sed -E 's/m[0-9]*s([0-9]*ms)?/m/g' > } So sometimes there's no ms part in output. In theory one would have to make the seconds part optional, too. Funny how tedious these little things may become to fix. Anyway, it should work without -E by escaping braces and the question mark. But accoring to sed(1), -E is in POSIX meanwhile so no big deal. > RULESET="add table ip x > +add set ip x y { type ipv4_addr; flags dynamic,timeout; } > +add element ip x y { 1.1.1.1 timeout 30m expires 15m59s }" > + > +EXPECTED="add table ip x > add set ip x y { type ipv4_addr; flags dynamic,timeout; } > add element ip x y { 1.1.1.1 timeout 30m expires 15m }" I would have piped RULESET through drop_seconds in the $DIFF call below, but this variant surely saves a few cycles. :D > test_output=$($NFT -e -f - <<< "$RULESET" 2>&1 | grep -v '# new generation' | drop_seconds) > > -if [ "$test_output" != "$RULESET" ] ; then > - $DIFF -u <(echo "$test_output") <(echo "$RULESET") > +if [ "$test_output" != "$EXPECTED" ] ; then > + $DIFF -u <(echo "$test_output") <(echo "$EXPECTED") > exit 1 > fi Cheers, Phil