diff mbox series

[nf] selftests: nft_concat_range: Move option for 'list ruleset' before command

Message ID 4029c54d1524098df2cadcc3bae2c93de88f8fcd.1582251063.git.sbrivio@redhat.com
State Accepted
Delegated to: Pablo Neira
Headers show
Series [nf] selftests: nft_concat_range: Move option for 'list ruleset' before command | expand

Commit Message

Stefano Brivio Feb. 21, 2020, 2:11 a.m. UTC 
Before nftables commit fb9cea50e8b3 ("main: enforce options before
commands"), 'nft list ruleset -a' happened to work, but it's wrong
and won't work anymore. Replace it by 'nft -a list ruleset'.

Reported-by: Chen Yi <yiche@redhat.com>
Fixes: 611973c1e06f ("selftests: netfilter: Introduce tests for sets with range concatenation")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
 .../testing/selftests/netfilter/nft_concat_range.sh  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Pablo Neira Ayuso Feb. 25, 2020, 12:01 p.m. UTC | #1 
On Fri, Feb 21, 2020 at 03:11:56AM +0100, Stefano Brivio wrote:
> Before nftables commit fb9cea50e8b3 ("main: enforce options before
> commands"), 'nft list ruleset -a' happened to work, but it's wrong
> and won't work anymore. Replace it by 'nft -a list ruleset'.

Applied, thanks.
diff mbox series

Patch

diff --git a/tools/testing/selftests/netfilter/nft_concat_range.sh b/tools/testing/selftests/netfilter/nft_concat_range.sh
index dc810e32c59e..5a4938d6dcf2 100755
--- a/tools/testing/selftests/netfilter/nft_concat_range.sh
+++ b/tools/testing/selftests/netfilter/nft_concat_range.sh
@@ -1037,7 +1037,7 @@  format_noconcat() {
 add() {
 	if ! nft add element inet filter test "${1}"; then
 		err "Failed to add ${1} given ruleset:"
-		err "$(nft list ruleset -a)"
+		err "$(nft -a list ruleset)"
 		return 1
 	fi
 }
@@ -1057,7 +1057,7 @@  add_perf() {
 add_perf_norange() {
 	if ! nft add element netdev perf norange "${1}"; then
 		err "Failed to add ${1} given ruleset:"
-		err "$(nft list ruleset -a)"
+		err "$(nft -a list ruleset)"
 		return 1
 	fi
 }
@@ -1066,7 +1066,7 @@  add_perf_norange() {
 add_perf_noconcat() {
 	if ! nft add element netdev perf noconcat "${1}"; then
 		err "Failed to add ${1} given ruleset:"
-		err "$(nft list ruleset -a)"
+		err "$(nft -a list ruleset)"
 		return 1
 	fi
 }
@@ -1075,7 +1075,7 @@  add_perf_noconcat() {
 del() {
 	if ! nft delete element inet filter test "${1}"; then
 		err "Failed to delete ${1} given ruleset:"
-		err "$(nft list ruleset -a)"
+		err "$(nft -a list ruleset)"
 		return 1
 	fi
 }
@@ -1146,7 +1146,7 @@  send_match() {
 		err "  $(for f in ${src}; do
 			 eval format_\$f "${2}"; printf ' '; done)"
 		err "should have matched ruleset:"
-		err "$(nft list ruleset -a)"
+		err "$(nft -a list ruleset)"
 		return 1
 	fi
 	nft reset counter inet filter test >/dev/null
@@ -1172,7 +1172,7 @@  send_nomatch() {
 		err "  $(for f in ${src}; do
 			 eval format_\$f "${2}"; printf ' '; done)"
 		err "should not have matched ruleset:"
-		err "$(nft list ruleset -a)"
+		err "$(nft -a list ruleset)"
 		return 1
 	fi
 }