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/arptables | |
| 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/arptables')
3 files changed, 7 insertions, 11 deletions
diff --git a/iptables/tests/shell/testcases/arptables/0001-arptables-save-restore_0 b/iptables/tests/shell/testcases/arptables/0001-arptables-save-restore_0 index e10f61cc..bf04dc0a 100755 --- a/iptables/tests/shell/testcases/arptables/0001-arptables-save-restore_0 +++ b/iptables/tests/shell/testcases/arptables/0001-arptables-save-restore_0 @@ -50,13 +50,12 @@ DUMP='*filter -A foo -j MARK --set-mark 12345 -A foo -j ACCEPT --opcode 1 -A foo -j ACCEPT --proto-type 0x800 --A foo -j ACCEPT -i lo --opcode 1 --proto-type 0x800 -' +-A foo -j ACCEPT -i lo --opcode 1 --proto-type 0x800' -diff -u <(echo -e "$DUMP") <($XT_MULTI arptables-save) +diff -u <(echo -e "$DUMP") <($XT_MULTI arptables-save | grep -v "^#") # make sure dump can be restored and check it didn't change $XT_MULTI arptables -F $XT_MULTI arptables-restore <<<$DUMP -diff -u <(echo -e "$DUMP") <($XT_MULTI arptables-save) +diff -u <(echo -e "$DUMP") <($XT_MULTI arptables-save | grep -v "^#") diff --git a/iptables/tests/shell/testcases/arptables/0002-arptables-restore-defaults_0 b/iptables/tests/shell/testcases/arptables/0002-arptables-restore-defaults_0 index b2ed95e8..38d387f3 100755 --- a/iptables/tests/shell/testcases/arptables/0002-arptables-restore-defaults_0 +++ b/iptables/tests/shell/testcases/arptables/0002-arptables-restore-defaults_0 @@ -11,8 +11,7 @@ set -e DUMP='*filter :OUTPUT ACCEPT -A OUTPUT -j mangle --mangle-ip-s 10.0.0.1 --A OUTPUT -j mangle --mangle-ip-d 10.0.0.2 -' +-A OUTPUT -j mangle --mangle-ip-d 10.0.0.2' # note how mangle-ip-s is unset in second rule @@ -20,8 +19,7 @@ EXPECT='*filter :INPUT ACCEPT :OUTPUT ACCEPT -A OUTPUT -j mangle --mangle-ip-s 10.0.0.1 --A OUTPUT -j mangle --mangle-ip-d 10.0.0.2 -' +-A OUTPUT -j mangle --mangle-ip-d 10.0.0.2' $XT_MULTI arptables -F $XT_MULTI arptables-restore <<<$DUMP diff --git a/iptables/tests/shell/testcases/arptables/0003-arptables-verbose-output_0 b/iptables/tests/shell/testcases/arptables/0003-arptables-verbose-output_0 index 3a9807a1..10c5ec33 100755 --- a/iptables/tests/shell/testcases/arptables/0003-arptables-verbose-output_0 +++ b/iptables/tests/shell/testcases/arptables/0003-arptables-verbose-output_0 @@ -58,7 +58,6 @@ EXPECT='*filter -A INPUT -j MARK -i eth23 --set-mark 42 -A OUTPUT -j CLASSIFY -o eth23 --set-class 23:42 -A OUTPUT -j foo -o eth23 --A foo -j mangle -o eth23 --mangle-ip-s 10.0.0.1 -' +-A foo -j mangle -o eth23 --mangle-ip-s 10.0.0.1' -diff -u -Z <(echo -e "$EXPECT") <($XT_MULTI arptables-save) +diff -u -Z <(echo -e "$EXPECT") <($XT_MULTI arptables-save | grep -v '^#') |