From ad4de2284dc47a88c1c73cc7bc55a745fec9eb13 Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Fri, 14 Oct 2016 23:38:30 +0200
Subject: Correct tests to check the number of entries too

Give enough time for the entries to timeout before listing, so that
we get the correct number of entries.

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
---
 tests/comment.t                 | 6 +++---
 tests/comment.t.list22          | 4 ++--
 tests/hash:ip,mark.t            | 2 +-
 tests/hash:ip,mark.t.list1      | 6 +++---
 tests/hash:ip,port,ip.t         | 2 +-
 tests/hash:ip,port,ip.t.list1   | 6 +++---
 tests/hash:ip,port,net.t        | 2 +-
 tests/hash:ip,port.t            | 2 +-
 tests/hash:ip,port.t.list1      | 6 +++---
 tests/hash:ip.t                 | 8 ++++----
 tests/hash:ip.t.list0           | 6 +++---
 tests/hash:ip.t.list1           | 6 +++---
 tests/hash:ip6,mark.t           | 2 +-
 tests/hash:ip6,mark.t.list1     | 6 +++---
 tests/hash:ip6,port,ip6.t       | 2 +-
 tests/hash:ip6,port,ip6.t.list1 | 6 +++---
 tests/hash:ip6,port.t           | 2 +-
 tests/hash:ip6,port.t.list1     | 6 +++---
 tests/hash:ip6.t                | 6 +++---
 tests/hash:ip6.t.list0          | 6 +++---
 tests/hash:ip6.t.list1          | 6 +++---
 tests/hash:mac.t                | 4 ++--
 tests/hash:mac.t.list0          | 6 +++---
 tests/hash:net,net.t            | 2 +-
 tests/hash:net,net.t.list1      | 6 +++---
 tests/hash:net,port,net.t       | 2 +-
 tests/hash:net,port.t           | 2 +-
 tests/hash:net,port.t.list1     | 6 +++---
 tests/hash:net.t                | 2 +-
 tests/hash:net.t.list1          | 6 +++---
 tests/hash:net6,net6.t          | 2 +-
 tests/hash:net6,net6.t.list1    | 6 +++---
 tests/hash:net6,port.t          | 2 +-
 tests/hash:net6,port.t.list1    | 6 +++---
 tests/hash:net6.t               | 2 +-
 tests/hash:net6.t.list1         | 6 +++---
 tests/runtest.sh                | 2 +-
 tests/setlist.t                 | 4 ++--
 38 files changed, 82 insertions(+), 82 deletions(-)

(limited to 'tests')

diff --git a/tests/comment.t b/tests/comment.t
index 204093a..130a033 100644
--- a/tests/comment.t
+++ b/tests/comment.t
@@ -117,7 +117,7 @@
 # Hash comment: Destroy test set
 0 ipset destroy test
 # Hash comment: create set with timeout
-0 ipset create test hash:ip comment timeout 5
+0 ipset create test hash:ip comment timeout 4
 # Hash comment: Add multiple elements with default timeout
 0 for x in `seq 0 255`; do echo "add test 2.0.0.$x comment \\\"text message $x\\\""; done | ipset restore
 # Hash comment: Add multiple elements with zero timeout
@@ -126,8 +126,8 @@
 0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # Hash comment: Check listing
 0 diff -u -I 'Size in memory.*' .foo comment.t.list21
-# Sleep 6s so that entries can time out
-0 sleep 6s
+# Sleep 5s so that entries can time out
+0 sleep 5s
 # Hash comment: List set
 0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
 # Hash comment: Check listing
diff --git a/tests/comment.t.list22 b/tests/comment.t.list22
index 15926f8..9215b0d 100644
--- a/tests/comment.t.list22
+++ b/tests/comment.t.list22
@@ -1,9 +1,9 @@
 Name: test
 Type: hash:ip
 Header: family inet hashsize 1024 maxelem 65536 timeout x comment
-Size in memory: 98256
+Size in memory: 57634
 References: 0
-Number of entries: 512
+Number of entries: 256
 Members:
 2.0.1.0 timeout x comment "text message 0"
 2.0.1.1 timeout x comment "text message 1"
diff --git a/tests/hash:ip,mark.t b/tests/hash:ip,mark.t
index f6bd6ee..9c51201 100644
--- a/tests/hash:ip,mark.t
+++ b/tests/hash:ip,mark.t
@@ -1,5 +1,5 @@
 # Create a set with timeout
-0 ipset create test hash:ip,mark timeout 5
+0 ipset create test hash:ip,mark timeout 4
 # Add partly zero valued element
 0 ipset add test 2.0.0.1,0x0
 # Test partly zero valued element
diff --git a/tests/hash:ip,mark.t.list1 b/tests/hash:ip,mark.t.list1
index a15cb52..c959e4c 100644
--- a/tests/hash:ip,mark.t.list1
+++ b/tests/hash:ip,mark.t.list1
@@ -1,7 +1,7 @@
 Name: test
 Type: hash:ip,mark
-Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 timeout 5
-Size in memory: 640
+Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 timeout 4
+Size in memory: 536
 References: 0
-Number of entries: 4
+Number of entries: 0
 Members:
diff --git a/tests/hash:ip,port,ip.t b/tests/hash:ip,port,ip.t
index 0cb2e0b..8a6954e 100644
--- a/tests/hash:ip,port,ip.t
+++ b/tests/hash:ip,port,ip.t
@@ -1,5 +1,5 @@
 # Create a set with timeout
-0 ipset create test hash:ip,port,ip timeout 5
+0 ipset create test hash:ip,port,ip timeout 4
 # Add partly zero valued element
 0 ipset add test 2.0.0.1,0,0.0.0.0
 # Test partly zero valued element
diff --git a/tests/hash:ip,port,ip.t.list1 b/tests/hash:ip,port,ip.t.list1
index c889014..7c7d560 100644
--- a/tests/hash:ip,port,ip.t.list1
+++ b/tests/hash:ip,port,ip.t.list1
@@ -1,7 +1,7 @@
 Name: test
 Type: hash:ip,port,ip
-Header: family inet hashsize 1024 maxelem 65536 timeout 5
-Size in memory: 840
+Header: family inet hashsize 1024 maxelem 65536 timeout 4
+Size in memory: 664
 References: 0
-Number of entries: 4
+Number of entries: 0
 Members:
diff --git a/tests/hash:ip,port,net.t b/tests/hash:ip,port,net.t
index cb68cb8..487f563 100644
--- a/tests/hash:ip,port,net.t
+++ b/tests/hash:ip,port,net.t
@@ -1,5 +1,5 @@
 # Create a set with timeout
-0 ipset create test hash:ip,port,net timeout 5
+0 ipset create test hash:ip,port,net timeout 4
 # Add partly zero valued element
 0 ipset add test 2.0.0.1,0,192.168.0.0/24
 # Test partly zero valued element
diff --git a/tests/hash:ip,port.t b/tests/hash:ip,port.t
index fc5d466..be323e0 100644
--- a/tests/hash:ip,port.t
+++ b/tests/hash:ip,port.t
@@ -1,5 +1,5 @@
 # Create a set with timeout
-0 ipset create test hash:ip,port timeout 5
+0 ipset create test hash:ip,port timeout 4
 # Add partly zero valued element
 0 ipset add test 2.0.0.1,0
 # Test partly zero valued element
diff --git a/tests/hash:ip,port.t.list1 b/tests/hash:ip,port.t.list1
index 4442ad6..4b79124 100644
--- a/tests/hash:ip,port.t.list1
+++ b/tests/hash:ip,port.t.list1
@@ -1,7 +1,7 @@
 Name: test
 Type: hash:ip,port
-Header: family inet hashsize 1024 maxelem 65536 timeout 5
-Size in memory: 640
+Header: family inet hashsize 1024 maxelem 65536 timeout 4
+Size in memory: 528
 References: 0
-Number of entries: 4
+Number of entries: 0
 Members:
diff --git a/tests/hash:ip.t b/tests/hash:ip.t
index a3ab1e2..36b82f9 100644
--- a/tests/hash:ip.t
+++ b/tests/hash:ip.t
@@ -1,11 +1,11 @@
 # IP: Create a set with timeout
-0 ipset -N test iphash --hashsize 128 timeout 5
+0 ipset -N test iphash --hashsize 128 timeout 4
 # Range: Add zero valued element
 1 ipset -A test 0.0.0.0
 # Range: Test zero valued element
 1 ipset -T test 0.0.0.0
 # IP: Add first random value
-0 ipset -A test 2.0.0.1 timeout 5
+0 ipset -A test 2.0.0.1 timeout 4
 # IP: Add second random value
 0 ipset -A test 192.168.68.69 timeout 0
 # IP: Test first random value
@@ -41,7 +41,7 @@
 # IP: Delete test set
 0 ipset -X test
 # IP: Restore values so that rehashing is triggered
-0 sed 's/hashsize 128/hashsize 128 timeout 5/' iphash.t.restore | ipset -R
+0 sed 's/hashsize 128/hashsize 128 timeout 4/' iphash.t.restore | ipset -R
 # IP: Check that the values are restored
 0 test `ipset -S test| grep add| wc -l` -eq 129
 # Sleep 5s so that elements can time out
@@ -73,7 +73,7 @@
 # IP: Destroy sets
 0 ipset -X
 # Network: Create a set with timeout
-0 ipset -N test iphash --hashsize 128 --netmask 24 timeout 5
+0 ipset -N test iphash --hashsize 128 --netmask 24 timeout 4
 # Network: Add zero valued element
 1 ipset -A test 0.0.0.0
 # Network: Test zero valued element
diff --git a/tests/hash:ip.t.list0 b/tests/hash:ip.t.list0
index d166f77..1859015 100644
--- a/tests/hash:ip.t.list0
+++ b/tests/hash:ip.t.list0
@@ -1,8 +1,8 @@
 Name: test
 Type: hash:ip
-Header: family inet hashsize 128 maxelem 65536 timeout 5
-Size in memory: 352
+Header: family inet hashsize 128 maxelem 65536 timeout 4
+Size in memory: 336
 References: 0
-Number of entries: 2
+Number of entries: 1
 Members:
 192.168.68.69 timeout 0
diff --git a/tests/hash:ip.t.list1 b/tests/hash:ip.t.list1
index db6827e..0977324 100644
--- a/tests/hash:ip.t.list1
+++ b/tests/hash:ip.t.list1
@@ -1,8 +1,8 @@
 Name: test
 Type: hash:ip
-Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout 5
-Size in memory: 464
+Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout 4
+Size in memory: 432
 References: 0
-Number of entries: 3
+Number of entries: 1
 Members:
 200.100.10.0 timeout 0
diff --git a/tests/hash:ip6,mark.t b/tests/hash:ip6,mark.t
index d4f9200..8f50acf 100644
--- a/tests/hash:ip6,mark.t
+++ b/tests/hash:ip6,mark.t
@@ -1,5 +1,5 @@
 # Create a set with timeout
-0 ipset create test hash:ip,mark family inet6 timeout 5
+0 ipset create test hash:ip,mark family inet6 timeout 4
 # Add partly zero valued element
 0 ipset add test 2:0:0::1,0x0
 # Test partly zero valued element
diff --git a/tests/hash:ip6,mark.t.list1 b/tests/hash:ip6,mark.t.list1
index 377fa79..5c7b730 100644
--- a/tests/hash:ip6,mark.t.list1
+++ b/tests/hash:ip6,mark.t.list1
@@ -1,7 +1,7 @@
 Name: test
 Type: hash:ip,mark
-Header: family inet6 markmask 0xffffffff hashsize 1024 maxelem 65536 timeout 5
-Size in memory: 1088
+Header: family inet6 markmask 0xffffffff hashsize 1024 maxelem 65536 timeout 4
+Size in memory: 800
 References: 0
-Number of entries: 4
+Number of entries: 0
 Members:
diff --git a/tests/hash:ip6,port,ip6.t b/tests/hash:ip6,port,ip6.t
index 6f7f4db..e8a75f0 100644
--- a/tests/hash:ip6,port,ip6.t
+++ b/tests/hash:ip6,port,ip6.t
@@ -1,5 +1,5 @@
 # Create a set with timeout
-0 ipset create test hash:ip,port,ip family inet6 timeout 5
+0 ipset create test hash:ip,port,ip family inet6 timeout 4
 # Add partly zero valued element
 0 ipset add test 2:0:0::1,0,0:0:0::0
 # Test partly zero valued element
diff --git a/tests/hash:ip6,port,ip6.t.list1 b/tests/hash:ip6,port,ip6.t.list1
index 3d42c1c..d3b61b7 100644
--- a/tests/hash:ip6,port,ip6.t.list1
+++ b/tests/hash:ip6,port,ip6.t.list1
@@ -1,7 +1,7 @@
 Name: test
 Type: hash:ip,port,ip
-Header: family inet6 hashsize 1024 maxelem 65536 timeout 5
-Size in memory: 1608
+Header: family inet6 hashsize 1024 maxelem 65536 timeout 4
+Size in memory: 1072
 References: 0
-Number of entries: 4
+Number of entries: 0
 Members:
diff --git a/tests/hash:ip6,port.t b/tests/hash:ip6,port.t
index b142f22..a47ca6e 100644
--- a/tests/hash:ip6,port.t
+++ b/tests/hash:ip6,port.t
@@ -1,5 +1,5 @@
 # Create a set with timeout
-0 ipset create test hash:ip,port family inet6 timeout 5
+0 ipset create test hash:ip,port family inet6 timeout 4
 # Add partly zero valued element
 0 ipset add test 2:0:0::1,0
 # Test partly zero valued element
diff --git a/tests/hash:ip6,port.t.list1 b/tests/hash:ip6,port.t.list1
index 2260fa6..d707af5 100644
--- a/tests/hash:ip6,port.t.list1
+++ b/tests/hash:ip6,port.t.list1
@@ -1,7 +1,7 @@
 Name: test
 Type: hash:ip,port
-Header: family inet6 hashsize 1024 maxelem 65536 timeout 5
-Size in memory: 1088
+Header: family inet6 hashsize 1024 maxelem 65536 timeout 4
+Size in memory: 800
 References: 0
-Number of entries: 4
+Number of entries: 0
 Members:
diff --git a/tests/hash:ip6.t b/tests/hash:ip6.t
index 2baaa83..5edc267 100644
--- a/tests/hash:ip6.t
+++ b/tests/hash:ip6.t
@@ -1,5 +1,5 @@
 # IP: Create a set with timeout
-0 ipset -N test iphash -6 --hashsize 128 timeout 5
+0 ipset -N test iphash -6 --hashsize 128 timeout 4
 # IP: Add zero valued element
 1 ipset -A test ::
 # IP: Test zero valued element
@@ -7,7 +7,7 @@
 # IP: Delete zero valued element
 1 ipset -D test ::
 # IP: Add first random value
-0 ipset -A test 2:0:0::1 timeout 5
+0 ipset -A test 2:0:0::1 timeout 4
 # IP: Add second random value
 0 ipset -A test 192:168:68::69 timeout 0
 # IP: Test first random value
@@ -47,7 +47,7 @@
 # IP: Delete test set
 0 ipset -X test
 # Network: Create a set with timeout
-0 ipset -N test iphash -6 --hashsize 128 --netmask 64 timeout 5
+0 ipset -N test iphash -6 --hashsize 128 --netmask 64 timeout 4
 # Network: Add zero valued element
 1 ipset -A test ::
 # Network: Test zero valued element
diff --git a/tests/hash:ip6.t.list0 b/tests/hash:ip6.t.list0
index 30e0c33..44b6fb4 100644
--- a/tests/hash:ip6.t.list0
+++ b/tests/hash:ip6.t.list0
@@ -1,8 +1,8 @@
 Name: test
 Type: hash:ip
-Header: family inet6 hashsize 128 maxelem 65536 timeout 5
-Size in memory: 512
+Header: family inet6 hashsize 128 maxelem 65536 timeout 4
+Size in memory: 416
 References: 0
-Number of entries: 2
+Number of entries: 1
 Members:
 192:168:68::69 timeout 0
diff --git a/tests/hash:ip6.t.list1 b/tests/hash:ip6.t.list1
index 337b194..838fa77 100644
--- a/tests/hash:ip6.t.list1
+++ b/tests/hash:ip6.t.list1
@@ -1,8 +1,8 @@
 Name: test
 Type: hash:ip
-Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout 5
-Size in memory: 704
+Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout 4
+Size in memory: 544
 References: 0
-Number of entries: 3
+Number of entries: 1
 Members:
 200:100:10:: timeout 0
diff --git a/tests/hash:mac.t b/tests/hash:mac.t
index f7023d0..361bf58 100644
--- a/tests/hash:mac.t
+++ b/tests/hash:mac.t
@@ -1,11 +1,11 @@
 # MAC: Create a set with timeout
-0 ipset -N test machash --hashsize 128 timeout 5
+0 ipset -N test machash --hashsize 128 timeout 4
 # Range: Add zero valued element
 1 ipset -A test 0:0:0:0:0:0
 # Range: Test zero valued element
 1 ipset -T test 0:0:0:0:0:0
 # MAC: Add first random value
-0 ipset -A test 0:0:0:0:2:0 timeout 5
+0 ipset -A test 0:0:0:0:2:0 timeout 4
 # MAC: Add second random value
 0 ipset -A test 0:a:0:0:0:0 timeout 0
 # MAC: Test first random value
diff --git a/tests/hash:mac.t.list0 b/tests/hash:mac.t.list0
index 824dd30..232b932 100644
--- a/tests/hash:mac.t.list0
+++ b/tests/hash:mac.t.list0
@@ -1,8 +1,8 @@
 Name: test
 Type: hash:mac
-Header: hashsize 128 maxelem 65536 timeout 5
-Size in memory: 384
+Header: hashsize 128 maxelem 65536 timeout 4
+Size in memory: 336
 References: 0
-Number of entries: 2
+Number of entries: 1
 Members:
 00:0A:00:00:00:00 timeout 0
diff --git a/tests/hash:net,net.t b/tests/hash:net,net.t
index b63ff32..13f1198 100644
--- a/tests/hash:net,net.t
+++ b/tests/hash:net,net.t
@@ -1,5 +1,5 @@
 # Create a set with timeout
-0 ipset create test hash:net,net hashsize 128 timeout 5
+0 ipset create test hash:net,net hashsize 128 timeout 4
 # Add zero valued element
 1 ipset add test 0.0.0.0/0,0.0.0.0/0
 # Test zero valued element
diff --git a/tests/hash:net,net.t.list1 b/tests/hash:net,net.t.list1
index 262440b..99e62c1 100644
--- a/tests/hash:net,net.t.list1
+++ b/tests/hash:net,net.t.list1
@@ -1,7 +1,7 @@
 Name: test
 Type: hash:net,net
-Header: family inet hashsize 128 maxelem 65536 timeout 5
-Size in memory: 1288
+Header: family inet hashsize 128 maxelem 65536 timeout 4
+Size in memory: 920
 References: 0
-Number of entries: 4
+Number of entries: 0
 Members:
diff --git a/tests/hash:net,port,net.t b/tests/hash:net,port,net.t
index 4b55631..0e92f5b 100644
--- a/tests/hash:net,port,net.t
+++ b/tests/hash:net,port,net.t
@@ -1,5 +1,5 @@
 # Create a set with timeout
-0 ipset create test hash:net,port,net timeout 5
+0 ipset create test hash:net,port,net timeout 4
 # Add partly zero valued element
 0 ipset add test 2.0.0.1/24,0,192.168.0.0/24
 # Test partly zero valued element
diff --git a/tests/hash:net,port.t b/tests/hash:net,port.t
index d51d27f..3c154f9 100644
--- a/tests/hash:net,port.t
+++ b/tests/hash:net,port.t
@@ -1,5 +1,5 @@
 # Create a set with timeout
-0 ipset create test hash:net,port hashsize 128 timeout 5
+0 ipset create test hash:net,port hashsize 128 timeout 4
 # Add zero valued element
 1 ipset add test 0.0.0.0/0,0
 # Test zero valued element
diff --git a/tests/hash:net,port.t.list1 b/tests/hash:net,port.t.list1
index 2e38e19..66f0955 100644
--- a/tests/hash:net,port.t.list1
+++ b/tests/hash:net,port.t.list1
@@ -1,7 +1,7 @@
 Name: test
 Type: hash:net,port
-Header: family inet hashsize 128 maxelem 65536 timeout 5
-Size in memory: 1024
+Header: family inet hashsize 128 maxelem 65536 timeout 4
+Size in memory: 880
 References: 0
-Number of entries: 4
+Number of entries: 0
 Members:
diff --git a/tests/hash:net.t b/tests/hash:net.t
index 6f54c25..e73f29c 100644
--- a/tests/hash:net.t
+++ b/tests/hash:net.t
@@ -1,5 +1,5 @@
 # Create a set with timeout
-0 ipset create test nethash hashsize 128 timeout 5
+0 ipset create test nethash hashsize 128 timeout 4
 # Add zero valued element
 1 ipset add test 0.0.0.0/0
 # Test zero valued element
diff --git a/tests/hash:net.t.list1 b/tests/hash:net.t.list1
index d96a658..6e74a1d 100644
--- a/tests/hash:net.t.list1
+++ b/tests/hash:net.t.list1
@@ -1,7 +1,7 @@
 Name: test
 Type: hash:net
-Header: family inet hashsize 128 maxelem 65536 timeout 5
-Size in memory: 895
+Header: family inet hashsize 128 maxelem 65536 timeout 4
+Size in memory: 784
 References: 0
-Number of entries: 4
+Number of entries: 0
 Members:
diff --git a/tests/hash:net6,net6.t b/tests/hash:net6,net6.t
index 3d6f447..57f8b2a 100644
--- a/tests/hash:net6,net6.t
+++ b/tests/hash:net6,net6.t
@@ -1,5 +1,5 @@
 # Create a set with timeout
-0 ipset create test hash:net,net family inet6 hashsize 128 timeout 5
+0 ipset create test hash:net,net family inet6 hashsize 128 timeout 4
 # Add zero valued element
 1 ipset add test ::/0,::/0
 # Test zero valued element
diff --git a/tests/hash:net6,net6.t.list1 b/tests/hash:net6,net6.t.list1
index ecc76b6..2ccfd51 100644
--- a/tests/hash:net6,net6.t.list1
+++ b/tests/hash:net6,net6.t.list1
@@ -1,7 +1,7 @@
 Name: test
 Type: hash:net,net
-Header: family inet6 hashsize 128 maxelem 65536 timeout 5
-Size in memory: 3144
+Header: family inet6 hashsize 128 maxelem 65536 timeout 4
+Size in memory: 2608
 References: 0
-Number of entries: 4
+Number of entries: 0
 Members:
diff --git a/tests/hash:net6,port.t b/tests/hash:net6,port.t
index a47ece7..e3e6584 100644
--- a/tests/hash:net6,port.t
+++ b/tests/hash:net6,port.t
@@ -1,5 +1,5 @@
 # Create a set with timeout
-0 ipset create test hash:net,port family inet6 hashsize 128 timeout 5
+0 ipset create test hash:net,port family inet6 hashsize 128 timeout 4
 # Add zero valued element
 1 ipset add test ::/0,tcp:8
 # Test zero valued element
diff --git a/tests/hash:net6,port.t.list1 b/tests/hash:net6,port.t.list1
index dc12d8f..788358b 100644
--- a/tests/hash:net6,port.t.list1
+++ b/tests/hash:net6,port.t.list1
@@ -1,8 +1,8 @@
 Name: test
 Type: hash:net,port
-Header: family inet6 hashsize 128 maxelem 65536 timeout 5
-Size in memory: 2352
+Header: family inet6 hashsize 128 maxelem 65536 timeout 4
+Size in memory: 1984
 References: 0
-Number of entries: 5
+Number of entries: 1
 Members:
 1:1:1::1,tcp:8 timeout 0
diff --git a/tests/hash:net6.t b/tests/hash:net6.t
index fc377f4..7a47655 100644
--- a/tests/hash:net6.t
+++ b/tests/hash:net6.t
@@ -1,5 +1,5 @@
 # Create a set with timeout
-0 ipset create test nethash family inet6 hashsize 128 timeout 5
+0 ipset create test nethash family inet6 hashsize 128 timeout 4
 # Add zero valued element
 1 ipset add test ::/0
 # Test zero valued element
diff --git a/tests/hash:net6.t.list1 b/tests/hash:net6.t.list1
index 20a4950..bf7dd88 100644
--- a/tests/hash:net6.t.list1
+++ b/tests/hash:net6.t.list1
@@ -1,7 +1,7 @@
 Name: test
 Type: hash:net
-Header: family inet6 hashsize 128 maxelem 65536 timeout 5
-Size in memory: 2112
+Header: family inet6 hashsize 128 maxelem 65536 timeout 4
+Size in memory: 1824
 References: 0
-Number of entries: 4
+Number of entries: 0
 Members:
diff --git a/tests/runtest.sh b/tests/runtest.sh
index 05550c6..6f5a250 100755
--- a/tests/runtest.sh
+++ b/tests/runtest.sh
@@ -83,7 +83,7 @@ for types in $tests; do
 		continue
 		;;
 	    skip)
-	    	eval $cmd
+		eval $cmd >/dev/null
 	    	if [ $? -ne 0 ]; then
 	    		echo "Skipping tests, '$cmd' failed"
 	    		break
diff --git a/tests/setlist.t b/tests/setlist.t
index 5e69fb3..7d14ec8 100644
--- a/tests/setlist.t
+++ b/tests/setlist.t
@@ -81,7 +81,7 @@
 # Check listing
 0 diff -u -I 'Size in memory.*' .foo setlist.t.list3
 # List all sets
-0 ipset list | grep -v Revision: > .foo
+0 sleep .1s; ipset list | grep -v Revision: > .foo
 # Check listing
 0 diff -u -I 'Size in memory.*' .foo setlist.t.list4
 # Flush sets
@@ -103,7 +103,7 @@
 # Delete set from the set
 0 ipset del test a
 # Check reference number of deleted set
-0 ref=`ipset list a | grep References | sed 's/References: //'` && test $ref -eq 0
+0 ref=`sleep .1s; ipset list a | grep References | sed 's/References: //'` && test $ref -eq 0
 # Add element to set a
 0 ipset add a 1.1.1.1
 # Swap sets
-- 
cgit v1.2.3