diff options
| author | Phil Sutter <phil@nwl.cc> | 2020-07-06 18:40:16 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2020-12-21 18:33:21 +0100 |
| commit | e28cf12cf50b9e2e0114f04331635fc122cb8aef (patch) | |
| tree | 1efec036ca89152cb49d53e42b703375c1fdd504 /iptables/tests/shell/testcases/firewalld-restore/0001-firewalld_0 | |
| parent | a599efa74dd98c70332428b68970ae0e218600da (diff) | |
tests: shell: Drop any dump sorting in place
With iptables-nft-save output now sorted just like legacy one, no
sorting to unify them is needed anymore.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables/tests/shell/testcases/firewalld-restore/0001-firewalld_0')
| -rwxr-xr-x | iptables/tests/shell/testcases/firewalld-restore/0001-firewalld_0 | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/iptables/tests/shell/testcases/firewalld-restore/0001-firewalld_0 b/iptables/tests/shell/testcases/firewalld-restore/0001-firewalld_0 index 0174b03f..4900554e 100755 --- a/iptables/tests/shell/testcases/firewalld-restore/0001-firewalld_0 +++ b/iptables/tests/shell/testcases/firewalld-restore/0001-firewalld_0 @@ -230,21 +230,8 @@ for table in nat mangle raw filter;do $XT_MULTI iptables-save -t $table | grep -v '^#' >> "$tmpfile" done -case "$XT_MULTI" in -*xtables-nft-multi) - # nft-multi displays chain names in different order, work around this for now - tmpfile2=$(mktemp) - sort "$tmpfile" > "$tmpfile2" - sort $(dirname "$0")/dumps/ipt-save-completed.txt > "$tmpfile" - diff -u $tmpfile $tmpfile2 - RET=$? - rm -f "$tmpfile2" - ;; -*) - diff -u $tmpfile $(dirname "$0")/dumps/ipt-save-completed.txt - RET=$? - ;; -esac +diff -u $tmpfile $(dirname "$0")/dumps/ipt-save-completed.txt +RET=$? rm -f "$tmpfile" |