Add more test to check adding/deleting multiple entries.

diff --git a/tests/hash:ip,port,ip.t b/tests/hash:ip,port,ip.t
index b658b5d5b5a299c627ca8f9fdebcaa38ba807f65..951cf26ce1bb2f0fbc6bae2935ef5c41004e92ea 100644 (file)
--- a/tests/hash:ip,port,ip.t
+++ b/tests/hash:ip,port,ip.t
@@ -46,6 +46,12 @@
 0 diff -I 'Size in memory.*' .foo hash:ip,port,ip.t.list1 && rm .foo
 # Flush test set
 0 ipset flush test
+# Add multiple elements in one step
+0 ipset add test 1.1.1.1-1.1.1.4,80-84,2.2.2.2
+# Delete multiple elements in one step
+0 ipset del test 1.1.1.2-1.1.1.3,tcp:81-82,2.2.2.2
+# Check number of elements after multi-add/multi-del
+0 n=`ipset save test|wc -l` && test $n -eq 17
 # Delete test set
 0 ipset destroy test
 # eof

diff --git a/tests/hash:ip,port.t b/tests/hash:ip,port.t
index 7d2abca61184984fd5c030153b0e6cf0572430ba..82f8716eed2393a12f4fdaeb7caac3879f968ef5 100644 (file)
--- a/tests/hash:ip,port.t
+++ b/tests/hash:ip,port.t
@@ -38,6 +38,12 @@
 0 diff -I 'Size in memory.*' .foo hash:ip,port.t.list1 && rm .foo
 # Flush test set
 0 ipset flush test
+# Add multiple elements in one step
+0 ipset add test 1.1.1.1-1.1.1.4,80-84
+# Delete multiple elements in one step
+0 ipset del test 1.1.1.2-1.1.1.3,tcp:81-82
+# Check number of elements after multi-add/multi-del
+0 n=`ipset save test|wc -l` && test $n -eq 17
 # Delete test set
 0 ipset destroy test
 # Create a set

diff --git a/tests/hash:ip.t b/tests/hash:ip.t
index 6293ae5b78c76dd569386cf508f3f19b814160c1..a0547518a10e9b13a3a83ebd3442458b9bc08622 100644 (file)
--- a/tests/hash:ip.t
+++ b/tests/hash:ip.t
@@ -30,6 +30,14 @@
 0 diff -I 'Size in memory.*' .foo hash:ip.t.list0 && rm .foo
 # IP: Flush test set
 0 ipset -F test
+# IP: Add multiple elements in one step
+0 ipset -A test 1.1.1.1-1.1.1.5
+# IP: Delete multiple elements in one step
+0 ipset -D test 1.1.1.2-1.1.1.5
+# IP: Test element after deletion
+0 ipset -T test 1.1.1.1
+# IP: Test deleted element
+1 ipset -T test 1.1.1.2
 # IP: Delete test set
 0 ipset -X test
 # IP: Restore values so that rehashing is triggered

diff --git a/tests/hash:ip6,port,ip6.t b/tests/hash:ip6,port,ip6.t
index bfdc2989ea947492a0a74921ae226d6248976f5f..93d2861c2dad499174b81bf788a4f91c2a546965 100644 (file)
--- a/tests/hash:ip6,port,ip6.t
+++ b/tests/hash:ip6,port,ip6.t
@@ -46,6 +46,12 @@
 0 diff -I 'Size in memory.*' .foo hash:ip6,port,ip6.t.list1 && rm .foo
 # Flush test set
 0 ipset flush test
+# Add multiple elements in one step
+0 ipset add test 1::1,udp:80-85,2::2
+# Delete multiple elements in one step
+0 ipset del test 1::1,udp:81-85,2::2
+# Check elements after multiple add/del
+0 ipset test test 1::1,udp:80,2::2
 # Delete test set
 0 ipset destroy test
 # eof

diff --git a/tests/hash:ip6,port.t b/tests/hash:ip6,port.t
index ead59a5265b439c789f3807dfe11c2834a4b888b..26d53001acfdfbf235fb84cd4ccda4705575630b 100644 (file)
--- a/tests/hash:ip6,port.t
+++ b/tests/hash:ip6,port.t
@@ -38,6 +38,12 @@
 0 diff -I 'Size in memory.*' .foo hash:ip6,port.t.list1 && rm .foo
 # Flush test set
 0 ipset flush test
+# Add multiple elements in one step
+0 ipset add test 1::1,udp:80-85
+# Delete multiple elements in one step
+0 ipset del test 1::1,udp:81-84
+# Check elements after multiple add/del
+0 ipset test test 1::1,udp:80
 # Delete test set
 0 ipset destroy test
 # eof

diff --git a/tests/hash:ip6.t b/tests/hash:ip6.t
index 7b206c736c006ff7992ffe1f7f852dc007502538..76a6879b4fbb3aec456f4bbb425a7f20c0431732 100644 (file)
--- a/tests/hash:ip6.t
+++ b/tests/hash:ip6.t
@@ -32,6 +32,8 @@
 0 diff -I 'Size in memory.*' .foo hash:ip6.t.list0 && rm .foo
 # IP: Flush test set
 0 ipset -F test
+# IP: Try to add multiple elements in one step
+1 ipset -A test 1::1-1::10
 # IP: Delete test set
 0 ipset -X test
 # Network: Create a set with timeout

diff --git a/tests/hash:net,port.t b/tests/hash:net,port.t
index d2d8e8add37ac2f1b6273d723589aaeec8eb43a0..e0f922df6589dbdb584883b725828ed45d7c075f 100644 (file)
--- a/tests/hash:net,port.t
+++ b/tests/hash:net,port.t
@@ -46,6 +46,12 @@
 0 diff -I 'Size in memory.*' .foo hash:net,port.t.list1 && rm .foo
 # Flush test set
 0 ipset flush test
+# Add multiple elements in one step
+0 ipset add test 1.1.1.1/24,80-84 timeout 0
+# Delete multiple elements in one step
+0 ipset del test 1.1.1.2/24,tcp:81-82
+# Check number of elements after multi-add/multi-del
+0 n=`ipset save test|wc -l` && test $n -eq 4
 # Delete test set
 0 ipset destroy test
 # eof

diff --git a/tests/hash:net6,port.t b/tests/hash:net6,port.t
index 099c4f5a15f5d7401da2a5f1e00ce33285ce0a72..9cce42f93e35c22921530aff1b3c393d2f1e567a 100644 (file)
--- a/tests/hash:net6,port.t
+++ b/tests/hash:net6,port.t
@@ -46,6 +46,12 @@
 0 diff -I 'Size in memory.*' .foo hash:net6,port.t.list1 && rm .foo
 # Flush test set
 0 ipset flush test
+# Add multiple elements in one step
+0 ipset add test 1::1/64,80-84 timeout 0
+# Delete multiple elements in one step
+0 ipset del test 1::1/64,tcp:81-82
+# Check number of elements after multi-add/multi-del
+0 n=`ipset save test|wc -l` && test $n -eq 4
 # Delete test set
 0 ipset destroy test
 # eof