summaryrefslogtreecommitdiffstats
path: root/tests/iphash.t
diff options
context:
space:
mode:
Diffstat (limited to 'tests/iphash.t')
-rw-r--r--tests/iphash.t28
1 files changed, 21 insertions, 7 deletions
diff --git a/tests/iphash.t b/tests/iphash.t
index 7a3ce1f..923931a 100644
--- a/tests/iphash.t
+++ b/tests/iphash.t
@@ -1,9 +1,9 @@
# IP: Create a set
0 ipset -N test iphash --hashsize 128
# Range: Add zero valued element
-2 ipset -A test 0.0.0.0
+1 ipset -A test 0.0.0.0
# Range: Test zero valued element
-2 ipset -T test 0.0.0.0
+1 ipset -T test 0.0.0.0
# IP: Add first random value
0 ipset -A test 2.0.0.1
# IP: Add second random value
@@ -14,18 +14,28 @@
0 ipset -T test 192.168.68.69
# IP: Test value not added to the set
1 ipset -T test 2.0.0.2
+# IP: Add third random value
+0 ipset -A test 200.100.0.12
+# IP: Delete the same value
+0 ipset -D test 200.100.0.12
# IP: List set
-0 ipset -L test > .foo0 && ./sort.sh .foo0
+0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0
# IP: Check listing
0 diff .foo iphash.t.list0 && rm .foo
# IP: Flush test set
0 ipset -F test
# IP: Delete test set
0 ipset -X test
+# IP: Restore values so that rehashing is triggered, old format
+0 ipset -R < iphash.t.restore.old
+# IP: Check that all values are restored
+0 (grep add iphash.t.restore | sort > .foo.1) && (ipset -S test | grep add | sort > .foo.2) && cmp .foo.1 .foo.2 && rm .foo.*
+# IP: Delete test set
+0 ipset -X test
# IP: Restore values so that rehashing is triggered
0 ipset -R < iphash.t.restore
# IP: Check that all values are restored
-0 (egrep -v '#|-N' iphash.t.restore | sort > .foo.1) && (ipset -S test | egrep -v '#|-N' | sort > .foo.2) && cmp .foo.1 .foo.2 && rm .foo.*
+0 (grep add iphash.t.restore | sort > .foo.1) && (ipset -S test | grep add | sort > .foo.2) && cmp .foo.1 .foo.2 && rm .foo.*
# IP: Flush test set
0 ipset -F test
# IP: Delete test set
@@ -33,11 +43,11 @@
# Network: Create a set
0 ipset -N test iphash --hashsize 128 --netmask 24
# Network: Add zero valued element
-2 ipset -A test 0.0.0.0
+1 ipset -A test 0.0.0.0
# Network: Test zero valued element
-2 ipset -T test 0.0.0.0
+1 ipset -T test 0.0.0.0
# Network: Delete zero valued element
-2 ipset -D test 0.0.0.0
+1 ipset -D test 0.0.0.0
# Network: Add first random network
0 ipset -A test 2.0.0.1
# Network: Add second random network
@@ -48,6 +58,10 @@
0 ipset -T test 192.168.68.95
# Network: Test value not added to the set
1 ipset -T test 2.0.1.0
+# Network: Add third random network
+0 ipset -A test 200.100.0.12
+# Network: Delete the same network
+0 ipset -D test 200.100.0.12
# Network: List set
0 ipset -L test > .foo0 && ./sort.sh .foo0
# Network: Check listing