On Wed, Oct 28, 2020 at 08:05:38PM +0100, Pablo Neira Ayuso wrote: > Hi Phil, > > On Wed, Oct 28, 2020 at 06:03:38PM +0100, Phil Sutter wrote: > > This reverts both commits 46b54fdcf266d3d631ffb6102067825d7672db46 and > > 0e258556f7f3da35deeb6d5cfdec51eafc7db80d. > > > > With both applied, the test succeeded *only* if 'nft monitor' was > > running in background, which is equivalent to the original problem > > (where the test succeeded only if *no* 'nft monitor' was running). > > > > The test merely exposed a kernel bug, so in fact it is correct. > > Please, do not revert this. > > This kernel patch needs this fix: > > https://patchwork.ozlabs.org/project/netfilter-devel/patch/20201022204032.28904-1-pablo@xxxxxxxxxxxxx/ With the kernel patch above, this test does not break anymore. ie. --echo is not printing the generation ID because kernel bug. > > Fixes: 46b54fdcf266d ("Revert "monitor: do not print generation ID with --echo"") > > Signed-off-by: Phil Sutter <phil@xxxxxx> > > --- > > tests/shell/testcases/sets/0036add_set_element_expiration_0 | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tests/shell/testcases/sets/0036add_set_element_expiration_0 b/tests/shell/testcases/sets/0036add_set_element_expiration_0 > > index 7b2e39a3f0406..51ed0f2c1b3e8 100755 > > --- a/tests/shell/testcases/sets/0036add_set_element_expiration_0 > > +++ b/tests/shell/testcases/sets/0036add_set_element_expiration_0 > > @@ -6,7 +6,7 @@ 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 30s expires 15s }" > > > > -test_output=$($NFT -e -f - <<< "$RULESET" 2>&1 | head -n -1) > > +test_output=$($NFT -e -f - <<< "$RULESET" 2>&1) > > > > if [ "$test_output" != "$RULESET" ] ; then > > $DIFF -u <(echo "$test_output") <(echo "$RULESET") > > -- > > 2.28.0 > >
