summaryrefslogtreecommitdiffstats
path: root/tests/hash:net.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:net.t
parentde340a7f1a9cf21931d94ea8814545c4b2d172b0 (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:net.t')
-rw-r--r--tests/hash:net.t16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/hash:net.t b/tests/hash:net.t
index 501f63e..c74ace1 100644
--- a/tests/hash:net.t
+++ b/tests/hash:net.t
@@ -33,15 +33,15 @@
# Try to add IP address
0 ipset add test 2.0.0.1
# List set
-0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
+0 ipset list test > .foo0 && ./sort.sh .foo0
# Check listing
-0 diff -u -I 'Size in memory.*' .foo hash:net.t.list0
+0 ./diff.sh .foo hash:net.t.list0
# Sleep 5s so that element can time out
0 sleep 5
# List set
-0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0
+0 ipset -L test > .foo0 && ./sort.sh .foo0
# Check listing
-0 diff -u -I 'Size in memory.*' .foo hash:net.t.list1
+0 ./diff.sh .foo hash:net.t.list1
# Flush test set
0 ipset flush test
# Delete test set
@@ -51,9 +51,9 @@
# Add networks in range notation
0 ipset add test 10.2.0.0-10.2.1.12
# List set
-0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0
+0 ipset -L test > .foo0 && ./sort.sh .foo0
# Check listing
-0 diff -u -I 'Size in memory.*' .foo hash:net.t.list2
+0 ./diff.sh .foo hash:net.t.list2
# Delete test set
0 ipset destroy test
# Stress test with range notation
@@ -127,9 +127,9 @@
# Add more than 2^31 elements in a range
0 ipset a test 0.0.0.0-128.0.0.1
# List set
-0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0
+0 ipset -L test > .foo0 && ./sort.sh .foo0
# Check listing
-0 diff -u -I 'Size in memory.*' .foo hash:net.t.list3
+0 ./diff.sh .foo hash:net.t.list3
# Delete test set
0 ipset destroy test
# Counters: create set