diff options
author | Phil Sutter <phil@nwl.cc> | 2019-07-22 12:16:20 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-07-23 21:14:40 +0200 |
commit | 8efec49e8684e8102cb69dc19c5ba07270b0f435 (patch) | |
tree | 4345a41cfc31eaad277040de294301f40cd98c1e /iptables/tests/shell/testcases/ebtables | |
parent | 43a87268372a2d2da1ec0d95cee60da0a6f83bff (diff) |
xtables-save: Unify *-save header/footer comments
Make eb- and arptables-save print both header and footer comments, too.
Also print them for each table separately - the timing information is
worth the extra lines in output.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables/tests/shell/testcases/ebtables')
3 files changed, 6 insertions, 13 deletions
diff --git a/iptables/tests/shell/testcases/ebtables/0002-ebtables-save-restore_0 b/iptables/tests/shell/testcases/ebtables/0002-ebtables-save-restore_0 index 080ba49a..e18d4655 100755 --- a/iptables/tests/shell/testcases/ebtables/0002-ebtables-save-restore_0 +++ b/iptables/tests/shell/testcases/ebtables/0002-ebtables-save-restore_0 @@ -99,7 +99,6 @@ DUMP='*filter -A foo --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 --limit 100/sec --limit-burst 5 -j ACCEPT - *nat :PREROUTING ACCEPT :OUTPUT DROP @@ -107,8 +106,7 @@ DUMP='*filter :nat_foo DROP -A PREROUTING -j redirect -A OUTPUT -j ACCEPT --A POSTROUTING -j ACCEPT -' +-A POSTROUTING -j ACCEPT' diff -u <(echo -e "$DUMP") <($XT_MULTI ebtables-save | grep -v '^#') diff --git a/iptables/tests/shell/testcases/ebtables/0003-ebtables-restore-defaults_0 b/iptables/tests/shell/testcases/ebtables/0003-ebtables-restore-defaults_0 index c8580547..62d22413 100755 --- a/iptables/tests/shell/testcases/ebtables/0003-ebtables-restore-defaults_0 +++ b/iptables/tests/shell/testcases/ebtables/0003-ebtables-restore-defaults_0 @@ -13,8 +13,7 @@ DUMP='*filter -A FORWARD --limit 100 --limit-burst 42 -j ACCEPT -A FORWARD --limit 1000 -j ACCEPT -A FORWARD --log --log-prefix "foobar" --A FORWARD --log -' +-A FORWARD --log' # note how limit-burst is 5 in second rule and log-prefix empty in fourth one @@ -25,8 +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 --log-prefix "" -j CONTINUE' $XT_MULTI ebtables --init-table $XT_MULTI ebtables-restore <<<$DUMP diff --git a/iptables/tests/shell/testcases/ebtables/0004-save-counters_0 b/iptables/tests/shell/testcases/ebtables/0004-save-counters_0 index 8348dc7e..46966f43 100755 --- a/iptables/tests/shell/testcases/ebtables/0004-save-counters_0 +++ b/iptables/tests/shell/testcases/ebtables/0004-save-counters_0 @@ -32,8 +32,7 @@ EXPECT='*filter :FORWARD ACCEPT :OUTPUT ACCEPT -A FORWARD -i nodev123 -o nodev432 -j ACCEPT --A FORWARD -i nodev432 -o nodev123 -j ACCEPT -' +-A FORWARD -i nodev432 -o nodev123 -j ACCEPT' echo "ebtables-save" diff -u <(echo -e "$EXPECT") <($XT_MULTI ebtables-save | grep -v '^#') @@ -43,8 +42,7 @@ EXPECT='*filter :FORWARD ACCEPT :OUTPUT ACCEPT [0:0] -A FORWARD -i nodev123 -o nodev432 -j ACCEPT -[0:0] -A FORWARD -i nodev432 -o nodev123 -j ACCEPT -' +[0:0] -A FORWARD -i nodev432 -o nodev123 -j ACCEPT' echo "ebtables-save -c" diff -u <(echo -e "$EXPECT") <($XT_MULTI ebtables-save -c | grep -v '^#') @@ -60,8 +58,7 @@ EXPECT='*filter :FORWARD ACCEPT :OUTPUT ACCEPT -A FORWARD -i nodev123 -o nodev432 -j ACCEPT -c 0 0 --A FORWARD -i nodev432 -o nodev123 -j ACCEPT -c 0 0 -' +-A FORWARD -i nodev432 -o nodev123 -j ACCEPT -c 0 0' echo "EBTABLES_SAVE_COUNTER=yes ebtables-save" diff -u <(echo -e "$EXPECT") <($XT_MULTI ebtables-save | grep -v '^#') |