From 00e8bd9bb72eb1357aab486e314b83f93dad0d2c Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Mon, 21 Sep 2020 20:12:23 +0200 Subject: 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 --- tests/hash:ip.t | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/hash:ip.t') diff --git a/tests/hash:ip.t b/tests/hash:ip.t index 36b82f9..3239701 100644 --- a/tests/hash:ip.t +++ b/tests/hash:ip.t @@ -19,15 +19,15 @@ # 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:ip.t.list2 +0 ./diff.sh .foo hash:ip.t.list2 # 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:ip.t.list0 +0 ./diff.sh .foo hash:ip.t.list0 # IP: Flush test set 0 ipset -F test # IP: Add multiple elements in one step @@ -97,15 +97,15 @@ # Network: Delete the same network 0 ipset -D test 200.100.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.*' -I 'Size in memory.*' .foo hash:ip.t.list3 +0 ./diff.sh .foo hash:ip.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:ip.t.list1 +0 ./diff.sh .foo hash:ip.t.list1 # Network: Flush test set 0 ipset -F test # Network: add element with 1s timeout -- cgit v1.2.3