summaryrefslogtreecommitdiffstats
path: root/tests/ipportnethash.t
diff options
context:
space:
mode:
Diffstat (limited to 'tests/ipportnethash.t')
-rw-r--r--tests/ipportnethash.t26
1 files changed, 11 insertions, 15 deletions
diff --git a/tests/ipportnethash.t b/tests/ipportnethash.t
index 93369ef..6aff583 100644
--- a/tests/ipportnethash.t
+++ b/tests/ipportnethash.t
@@ -1,13 +1,11 @@
-# Range: Try to create from an invalid range
-2 ipset -N test ipportnethash --from 2.0.0.1 --to 2.1.0.1
-# Range: Create a set from a valid range
+# Range: Create a set from a range (range ignored)
0 ipset -N test ipportnethash --from 2.0.0.1 --to 2.1.0.0
# Range: Add zero valued element
-2 ipset -A test 2.0.0.1,0,0.0.0.0/0
+1 ipset -A test 2.0.0.1,0,0.0.0.0/0
# Range: Test zero valued element
-2 ipset -T test 2.0.0.1,0,0.0.0.0/0
+1 ipset -T test 2.0.0.1,0,0.0.0.0/0
# Range: Delete zero valued element
-2 ipset -D test 2.0.0.1,0,0.0.0.0/0
+1 ipset -D test 2.0.0.1,0,0.0.0.0/0
# Range: Add almost zero valued element
0 ipset -A test 2.0.0.1,0,0.0.0.0/24
# Range: Test almost zero valued element
@@ -33,20 +31,18 @@
# Range: Test value after upper boundary
1 ipset -T test 2.1.0.1,128,2.2.2.2
# Range: Try to add value before lower boundary
-1 ipset -A test 2.0.0.0,5,1.1.1.1/24
+0 ipset -A test 2.0.0.0,5,1.1.1.1/24
# Range: Try to add value after upper boundary
-1 ipset -A test 2.1.0.1,128,2.2.2.2/12
+0 ipset -A test 2.1.0.1,128,2.2.2.2/12
# Range: List set
0 ipset -L test > .foo0 && ./sort.sh .foo0
# Range: Check listing
-0 diff .foo ipportnethash.t.list0 && rm .foo
+0 diff -I 'Size in memory.*' .foo ipportnethash.t.list0 && rm .foo
# Range: Flush test set
0 ipset -F test
# Range: Delete test set
0 ipset -X test
-# Network: Try to create a set from an invalid network
-2 ipset -N test ipportnethash --network 2.0.0.0/15
-# Network: Create a set from a valid network
+# Network: Create a set from a valid network (network ignored)
0 ipset -N test ipportnethash --network 2.0.0.0/16
# Network: Add lower boundary
0 ipset -A test 2.0.0.0,5,1.1.1.1/24
@@ -65,13 +61,13 @@
# Network: Test value after upper boundary
1 ipset -T test 2.1.0.0,128,2.2.2.2
# Network: Try to add value before lower boundary
-1 ipset -A test 1.255.255.255,5,1.1.1.1/24
+0 ipset -A test 1.255.255.255,5,1.1.1.1/24
# Network: Try to add value after upper boundary
-1 ipset -A test 2.1.0.0,128,2.2.2.2/12
+0 ipset -A test 2.1.0.0,128,2.2.2.2/12
# Network: List set
0 ipset -L test > .foo0 && ./sort.sh .foo0
# Network: Check listing
-0 diff .foo ipportnethash.t.list1 && rm .foo
+0 diff -I 'Size in memory.*' .foo ipportnethash.t.list1 && rm .foo
# Network: Flush test set
0 ipset -F test
# Network: Delete test set