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/hash:ip6.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/hash:ip6.t')
-rw-r--r-- | tests/hash:ip6.t | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/hash:ip6.t b/tests/hash:ip6.t index 5edc267..52175a5 100644 --- a/tests/hash:ip6.t +++ b/tests/hash:ip6.t @@ -21,25 +21,25 @@ # IP: Delete the same value 0 ipset -D test 200:100:0::12 # IP: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # IP: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6.t.list2 +0 ./diff.sh .foo hash:ip6.t.list2 # IP: Save set 0 ipset save test > hash:ip6.t.restore # Sleep 5s so that element can time out 0 sleep 5 # 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 hash:ip6.t.list0 +0 ./diff.sh .foo hash:ip6.t.list0 # IP: Destroy set 0 ipset x test # IP: Restore saved set 0 ipset restore < hash:ip6.t.restore && rm hash:ip6.t.restore # IP: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # IP: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6.t.list2 +0 ./diff.sh .foo hash:ip6.t.list2 # IP: Flush test set 0 ipset -F test # IP: Try to add multiple elements in one step @@ -73,15 +73,15 @@ # Network: Test the deleted network 1 ipset -T test 200:101:0::12 # Network: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Network: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6.t.list3 +0 ./diff.sh .foo hash:ip6.t.list3 # Sleep 5s so that elements can time out 0 sleep 5 # Network: List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Network: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6.t.list1 +0 ./diff.sh .foo hash:ip6.t.list1 # Network: Flush test set 0 ipset -F test # Network: Delete test set @@ -89,13 +89,13 @@ # Check more complex restore commands 0 ipset restore < restore.t.restore # List restored set a -0 ipset l a | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset l a > .foo0 && ./sort.sh .foo0 # Check listing of set a -0 diff -u -I 'Size in memory.*' .foo restore.t.list0 +0 ./diff.sh .foo restore.t.list0 # List restored set b -0 ipset l b | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset l b > .foo0 && ./sort.sh .foo0 # Check listing of set b -0 diff -u -I 'Size in memory.*' .foo restore.t.list1 +0 ./diff.sh .foo restore.t.list1 # Destroy by restore 0 ipset restore < restore.t.destroy # Timeout: Check that resizing keeps timeout values |