diff options
| author | Jozsef Kadlecsik <kadlec@netfilter.org> | 2020-09-21 20:12:23 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@netfilter.org> | 2020-09-21 20:12:23 +0200 |
| commit | 00e8bd9bb72eb1357aab486e314b83f93dad0d2c (patch) | |
| tree | 2222d756d82d88a0872688ca61cdadd147a84ddb /tests/iphash.t | |
| parent | de340a7f1a9cf21931d94ea8814545c4b2d172b0 (diff) | |
Handle all variable header parts in helper scripts instead ot test tasks
Thus the tests tasks can be simplified and all exceptions can be handled in
the helper scripts.
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Diffstat (limited to 'tests/iphash.t')
| -rw-r--r-- | tests/iphash.t | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/iphash.t b/tests/iphash.t index 0393295..4d65113 100644 --- a/tests/iphash.t +++ b/tests/iphash.t @@ -23,9 +23,9 @@ # IP: Delete element not added to the set, ignoring error 0 ipset -! -D test 200.100.0.12 # IP: List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # IP: Check listing -0 diff -u -I 'Size in memory.*' .foo iphash.t.list0 +0 ./diff.sh .foo iphash.t.list0 # IP: Flush test set 0 ipset -F test # IP: Delete test set @@ -53,9 +53,9 @@ # IP: Add more entries to the second set 0 tail -n +2 iphash.t.restore | sed -e 's/test/test2/' -e 's/ 10/ 30/' | ipset r # IP: Save sets -0 ipset -s -f .foo.1 save +0 ipset -s -f .foo0 save && ./ignore.sh .foo0 # IP: Compare sorted save and restore -0 cmp .foo.1 iphash.t.restore.sorted +0 cmp .foo iphash.t.restore.sorted # IP: Delete test set 0 ipset x test # IP: Delete test2 set @@ -63,9 +63,9 @@ # IP: Restore, which requires multiple messages 0 ipset restore < iphash.t.large # IP: Save the restored set -0 ipset save test | sort > .foo.1 +0 (ipset save test | sort > .foo.1) && ./ignore.sh .foo.1 # IP: Compare save and restore -0 (sort iphash.t.large > .foo.2) && (cmp .foo.1 .foo.2) +0 (sort iphash.t.large > .foo.2) && (cmp .foo .foo.2) # IP: Delete all elements, one by one 0 ipset list test | sed '1,/Members/d' | xargs -n1 ipset del test # IP: Delete test set @@ -95,9 +95,9 @@ # Network: Delete element not added to the set 1 ipset -D test 200.100.0.12 # Network: List set -0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Network: Check listing -0 diff -u -I 'Size in memory.*' .foo iphash.t.list1 +0 ./diff.sh .foo iphash.t.list1 # Network: Flush test set 0 ipset -F test # Network: Delete test set |