From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [nft PATCH] tests/shell: Restore testcases/sets/0036add_set_element_expiration_0
Date: Wed, 28 Oct 2020 18:03:38 +0100 [thread overview]
Message-ID: <20201028170338.32033-1-phil@nwl.cc> (raw)
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.
Fixes: 46b54fdcf266d ("Revert "monitor: do not print generation ID with --echo"")
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
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
next reply other threads:[~2020-10-28 22:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 17:03 Phil Sutter [this message]
2020-10-28 19:05 ` [nft PATCH] tests/shell: Restore testcases/sets/0036add_set_element_expiration_0 Pablo Neira Ayuso
2020-10-28 19:08 ` Pablo Neira Ayuso
2020-10-29 11:18 ` Phil Sutter
2020-10-29 11:44 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201028170338.32033-1-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).