summaryrefslogtreecommitdiff
path: root/tests/hash:ip.t
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@netfilter.org>2020-09-21 20:12:23 +0200
committerJozsef Kadlecsik <kadlec@netfilter.org>2020-09-21 20:12:23 +0200
commit00e8bd9bb72eb1357aab486e314b83f93dad0d2c (patch)
tree2222d756d82d88a0872688ca61cdadd147a84ddb /tests/hash:ip.t
parentde340a7f1a9cf21931d94ea8814545c4b2d172b0 (diff)
downloadipset-00e8bd9bb72eb1357aab486e314b83f93dad0d2c.tar.gz
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:ip.t')
-rw-r--r--tests/hash:ip.t16
1 files changed, 8 insertions, 8 deletions
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