On Thu, Sep 28, 2023 at 04:58:46PM +0200, Phil Sutter wrote:
> 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 <pablo@xxxxxxxxxxxxx>
> > ---
> > 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
I am useless. I quickly tried this, but echo disregards newlines,
triggering a mismatch in the diff, perhaps printf can address this.
I just wanted to make this reliable, it has been bothering me in my
test infrastructure which is running this in a loop and occasionally
triggering this false positive.
