Skip to contentSkip to conversation

tests: shell: Fix expected output for ip6tables dst match

PATCH New Phil Sutter 1 participant 2 messages Oct 6, 2022 netfilter

lore
Share & tools
lore

Phil Sutter

author reviewer
#0 lore raw

PATCH 1/2 tests: shell: Fix expected output for ip6tables dst match

Forgot to update the shell testsuites when fixing for duplicate whitespace in output.

Fixes 11e06cbb3a877 ("extensions: libip6t_dst: Fix output for empty options")
---
 .../tests/shell/testcases/ip6tables/0002-verbose-output_0     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
iptables/tests/shell/testcases/ip6tables/0002-verbose-output_0 +2 -2
index 2a1518d6fb0de..cc18a94b96986 100755
@@ -12,7 +12,7 @@ VOUT2='ACCEPT  all opt -- in eth2 out eth3  feed:babe::4  -> feed:babe::5'
 RULE3='-p icmpv6 -m icmp6 --icmpv6-type no-route'
 VOUT3='  ipv6-icmp opt -- in * out *  ::/0  -> ::/0   ipv6-icmptype 1 code 0'
 RULE4='-m dst --dst-len 42 -m rt --rt-type 23'
-VOUT4='  all opt -- in * out *  ::/0  -> ::/0   dst length:42  rt type:23'
+VOUT4='  all opt -- in * out *  ::/0  -> ::/0   dst length:42 rt type:23'
 RULE5='-m frag --fragid 1337 -j LOG'
 VOUT5='LOG  all opt -- in * out *  ::/0  -> ::/0   frag id:1337 LOG flags 0 level 4'
 
@@ -36,7 +36,7 @@ Chain FORWARD (policy ACCEPT 0 packets, 0 bytes)
     0     0 ACCEPT     0    --  eth2   eth3    feed:babe::1         feed:babe::2
     0     0 ACCEPT     0    --  eth2   eth3    feed:babe::4         feed:babe::5
     0     0            58   --  *      *       ::/0                 ::/0                 ipv6-icmptype 1 code 0
-    0     0            0    --  *      *       ::/0                 ::/0                 dst length:42  rt type:23
+    0     0            0    --  *      *       ::/0                 ::/0                 dst length:42 rt type:23
     0     0 LOG        0    --  *      *       ::/0                 ::/0                 frag id:1337 LOG flags 0 level 4
 
 Chain OUTPUT (policy ACCEPT 0 packets, 0 bytes)
Signature · 1 line
2.34.1
author reviewer
#1 lore raw

PATCH 2/2 tests: shell: Fix expected ebtables log target output

Forgot to update shell testsuite when removing empty --log-prefix options.

Fixes 9cdb52d655608 ("extensions: libebt_log: Avoid empty log-prefix in output")
---
 .../shell/testcases/ebtables/0002-ebtables-save-restore_0     | 4 ++--
 .../shell/testcases/ebtables/0003-ebtables-restore-defaults_0 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
iptables/tests/shell/testcases/ebtables/0002-ebtables-save-restore_0 +2 -2
index 0537f5677c5d5..1091a4e80bebe 100755
@@ -91,13 +91,13 @@ DUMP='*filter
 -A foo -p IPv6 --ip6-dst feed:babe::/64 -j ACCEPT
 -A foo -p IPv6 --ip6-proto tcp -j ACCEPT
 -A foo --limit 100/sec --limit-burst 42 -j ACCEPT
--A foo --log-level notice --log-prefix "" -j CONTINUE
+-A foo --log-level notice -j CONTINUE
 -A foo -j mark --mark-set 0x23 --mark-target ACCEPT
 -A foo --nflog-group 1 -j CONTINUE
 -A foo --pkttype-type multicast -j ACCEPT
 -A foo --stp-type config -j ACCEPT
 -A foo -p Length --802_3-sap 0x23 --limit 100/sec --limit-burst 5 -j ACCEPT
--A foo --pkttype-type multicast --log-level notice --log-prefix "" -j CONTINUE
+-A foo --pkttype-type multicast --log-level notice -j CONTINUE
 -A foo --pkttype-type multicast --limit 100/sec --limit-burst 5 -j ACCEPT
 *nat
 :PREROUTING ACCEPT
iptables/tests/shell/testcases/ebtables/0003-ebtables-restore-defaults_0 +1 -1
index 63891c1bb731a..7554ef8571511 100755
@@ -24,7 +24,7 @@ EXPECT='*filter
 -A FORWARD --limit 100/sec --limit-burst 42 -j ACCEPT
 -A FORWARD --limit 1000/sec --limit-burst 5 -j ACCEPT
 -A FORWARD --log-level notice --log-prefix "foobar" -j CONTINUE
--A FORWARD --log-level notice --log-prefix "" -j CONTINUE'
+-A FORWARD --log-level notice -j CONTINUE'
 
 $XT_MULTI ebtables --init-table
 $XT_MULTI ebtables-restore <<<$DUMP
Signature · 1 line
2.34.1