From d5125000ff9d5af0f3b4b4c1dde9230c2438b110 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Mon, 13 Dec 2010 17:46:23 +0100 Subject: Speed up testing a little bit Lower timeout values to max 5s, so we can lower sleep values too. --- tests/bitmap:ip.t | 26 +++++++++++++------------- tests/hash:ip,port,ip.t | 4 ++-- tests/hash:ip,port.t | 4 ++-- tests/hash:ip.t | 16 ++++++++-------- tests/hash:ip.t.list1 | 2 +- tests/hash:ip6,port,ip6.t | 4 ++-- tests/hash:ip6,port.t | 4 ++-- tests/hash:ip6.t | 10 +++++----- tests/hash:ip6.t.list1 | 2 +- tests/hash:net,port.t | 6 +++--- tests/hash:net,port.t.list1 | 2 +- tests/hash:net.t | 6 +++--- tests/hash:net.t.list1 | 2 +- tests/hash:net6,port.t | 6 +++--- tests/hash:net6,port.t.list1 | 2 +- tests/hash:net6.t | 6 +++--- tests/hash:net6.t.list1 | 2 +- tests/macipmap.t | 14 +++++++------- tests/macipmap.t.list2 | 4 ++-- tests/macipmap.t.list3 | 2 +- tests/portmap.t | 6 +++--- 21 files changed, 65 insertions(+), 65 deletions(-) (limited to 'tests') diff --git a/tests/bitmap:ip.t b/tests/bitmap:ip.t index 29a1a5a..40c2a98 100644 --- a/tests/bitmap:ip.t +++ b/tests/bitmap:ip.t @@ -3,7 +3,7 @@ # Range: Create a set from a valid range with timeout 0 ipset create test bitmap:ip range 2.0.0.1-2.1.0.0 timeout 5 # Range: Add lower boundary -0 ipset add test 2.0.0.1 timeout 10 +0 ipset add test 2.0.0.1 timeout 4 # Range: Add upper boundary 0 ipset add test 2.1.0.0 timeout 0 # Range: Test lower boundary @@ -33,13 +33,13 @@ # Range: Delete the same element 0 ipset -D test 2.0.0.128 # Range: Add a range of elements -0 ipset -A test 2.0.0.128-2.0.0.131 timeout 6 +0 ipset -A test 2.0.0.128-2.0.0.131 timeout 4 # Range: List set 0 ipset list test | sed 's/timeout ./timeout x/' > .foo # Range: Check listing 0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list4 && rm .foo -# Sleep 10s so that entries can time out -0 sleep 10s +# Sleep 5s so that entries can time out +0 sleep 5s # Range: List set after timeout 0 ipset list test > .foo # Range: Check listing @@ -49,13 +49,13 @@ # Range: Delete test set 0 ipset destroy test # Network: Try to create a set from an invalid network with timeout -1 ipset create test bitmap:ip range 2.0.0.0/15 +1 ipset create test bitmap:ip range 2.0.0.0/15 timeout 5 # Network: Create a set from a valid network with timeout 0 ipset create test bitmap:ip range 2.0.0.0/16 timeout 5 # Network: Add lower boundary 0 ipset add test 2.0.0.0 timeout 0 # Network: Add upper boundary -0 ipset add test 2.0.255.255 timeout 10 +0 ipset add test 2.0.255.255 timeout 4 # Network: Test lower boundary 0 ipset test test 2.0.0.0 # Network: Test upper boundary @@ -73,15 +73,15 @@ # Network: Delete element not added to the set 1 ipset -D test 2.0.0.2 # Network: Add element in the middle -0 ipset -A test 2.0.0.128 timeout 20 +0 ipset -A test 2.0.0.128 timeout 4 # Network: Delete the same element 0 ipset -D test 2.0.0.128 # Network: List set 0 ipset list test | sed 's/timeout ./timeout x/' > .foo # Network: Check listing 0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list5 && rm .foo -# Sleep 10s so that entries can time out -0 sleep 10s +# Sleep 5s so that entries can time out +0 sleep 5s # Network: List set 0 ipset list test > .foo # Network: Check listing @@ -93,7 +93,7 @@ # Subnets: Create a set to store networks with timeout 0 ipset create test bitmap:ip range 10.0.0.0/8 netmask 24 timeout 5 # Subnets: Add lower boundary -0 ipset add test 10.0.0.0 timeout 10 +0 ipset add test 10.0.0.0 timeout 4 # Subnets: Add upper boundary 0 ipset add test 10.255.255.255 timeout 0 # Subnets: Test lower boundary @@ -117,13 +117,13 @@ # Subnets: Delete the same element from the set 0 ipset -D test 10.2.0.0 # Subnets: Add a subnet of subnets -0 ipset -A test 10.8.0.0/16 timeout 8 +0 ipset -A test 10.8.0.0/16 timeout 4 # Subnets: List set 0 ipset list test | sed 's/timeout ./timeout x/' > .foo # Subnets: Check listing 0 diff -I 'Size in memory.*' .foo bitmap:ip.t.list6 && rm .foo -# Sleep 10s so that entries can time out -0 sleep 10s +# Sleep 5s so that entries can time out +0 sleep 5s # Subnets: List set 0 ipset list test > .foo # Subnets: Check listing diff --git a/tests/hash:ip,port,ip.t b/tests/hash:ip,port,ip.t index cc6783b..69411ca 100644 --- a/tests/hash:ip,port,ip.t +++ b/tests/hash:ip,port,ip.t @@ -38,8 +38,8 @@ 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # Check listing 0 diff -I 'Size in memory.*' .foo hash:ip,port,ip.t.list0 && rm .foo -# Sleep 6s so that elements can time out -0 sleep 6 +# Sleep 5s so that elements can time out +0 sleep 5 # List set 0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing diff --git a/tests/hash:ip,port.t b/tests/hash:ip,port.t index 6fe18ee..53bf69d 100644 --- a/tests/hash:ip,port.t +++ b/tests/hash:ip,port.t @@ -30,8 +30,8 @@ 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # Check listing 0 diff -I 'Size in memory.*' .foo hash:ip,port.t.list0 && rm .foo -# Sleep 6s so that elements can time out -0 sleep 6 +# Sleep 5s so that elements can time out +0 sleep 5 # List set 0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing diff --git a/tests/hash:ip.t b/tests/hash:ip.t index c45bb2d..a7f56bd 100644 --- a/tests/hash:ip.t +++ b/tests/hash:ip.t @@ -22,8 +22,8 @@ 0 ipset -L test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # IP: Check listing 0 diff -I 'Size in memory.*' .foo hash:ip.t.list2 && rm .foo -# Sleep 6s so that element can time out -0 sleep 6 +# Sleep 5s so that element can time out +0 sleep 5 # IP: List set 0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0 # IP: Check listing @@ -33,11 +33,11 @@ # IP: Delete test set 0 ipset -X test # IP: Restore values so that rehashing is triggered -0 sed 's/hashsize 128/hashsize 128 timeout 6/' iphash.t.restore | ipset -R +0 sed 's/hashsize 128/hashsize 128 timeout 5/' iphash.t.restore | ipset -R # IP: Check that the values are restored 0 test `ipset -S test| grep add| wc -l` -eq 129 -# Sleep 8s so that elements can time out -0 sleep 8 +# Sleep 5s so that elements can time out +0 sleep 5 # IP: check that elements timed out 0 test `ipset -S test| grep add| wc -l` -eq 0 # IP: Flush test set @@ -47,7 +47,7 @@ # IP: Stress test resizing 0 ./resize.sh # Network: Create a set with timeout -0 ipset -N test iphash --hashsize 128 --netmask 24 timeout 6 +0 ipset -N test iphash --hashsize 128 --netmask 24 timeout 5 # Network: Add zero valued element 1 ipset -A test 0.0.0.0 # Network: Test zero valued element @@ -74,8 +74,8 @@ 0 ipset -L test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # Network: Check listing 0 diff -I 'Size in memory.*' -I 'Size in memory.*' .foo hash:ip.t.list3 && rm .foo -# Sleep 6s so that elements can time out -0 sleep 6 +# Sleep 5s so that elements can time out +0 sleep 5 # Network: List set 0 ipset -L test > .foo # Network: Check listing diff --git a/tests/hash:ip.t.list1 b/tests/hash:ip.t.list1 index 3189dae..b15a212 100644 --- a/tests/hash:ip.t.list1 +++ b/tests/hash:ip.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout 6 +Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout 5 Size in memory: 1352 References: 0 Members: diff --git a/tests/hash:ip6,port,ip6.t b/tests/hash:ip6,port,ip6.t index 712db33..b4d05e9 100644 --- a/tests/hash:ip6,port,ip6.t +++ b/tests/hash:ip6,port,ip6.t @@ -38,8 +38,8 @@ 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # Check listing 0 diff -I 'Size in memory.*' .foo hash:ip6,port,ip6.t.list0 && rm .foo -# Sleep 6s so that elements can time out -0 sleep 6 +# Sleep 5s so that elements can time out +0 sleep 5 # List set 0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing diff --git a/tests/hash:ip6,port.t b/tests/hash:ip6,port.t index 5b00942..fdd61da 100644 --- a/tests/hash:ip6,port.t +++ b/tests/hash:ip6,port.t @@ -30,8 +30,8 @@ 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # Check listing 0 diff -I 'Size in memory.*' .foo hash:ip6,port.t.list0 && rm .foo -# Sleep 6s so that elements can time out -0 sleep 6 +# Sleep 5s so that elements can time out +0 sleep 5 # List set 0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing diff --git a/tests/hash:ip6.t b/tests/hash:ip6.t index dae9e1e..7b206c7 100644 --- a/tests/hash:ip6.t +++ b/tests/hash:ip6.t @@ -24,8 +24,8 @@ 0 ipset -L test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # IP: Check listing 0 diff -I 'Size in memory.*' .foo hash:ip6.t.list2 && rm .foo -# Sleep 6s so that element can time out -0 sleep 6 +# Sleep 5s so that element can time out +0 sleep 5 # IP: List set 0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0 # IP: Check listing @@ -35,7 +35,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 6 +0 ipset -N test iphash -6 --hashsize 128 --netmask 64 timeout 5 # Network: Add zero valued element 1 ipset -A test :: # Network: Test zero valued element @@ -64,8 +64,8 @@ 0 ipset -L test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # Network: Check listing 0 diff -I 'Size in memory.*' .foo hash:ip6.t.list3 && rm .foo -# Sleep 6s so that elements can time out -0 sleep 6 +# Sleep 5s so that elements can time out +0 sleep 5 # Network: List set 0 ipset -L test > .foo # Network: Check listing diff --git a/tests/hash:ip6.t.list1 b/tests/hash:ip6.t.list1 index ce5c5fe..00b3323 100644 --- a/tests/hash:ip6.t.list1 +++ b/tests/hash:ip6.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip -Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout 6 +Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout 5 Size in memory: 1448 References: 0 Members: diff --git a/tests/hash:net,port.t b/tests/hash:net,port.t index 19f45d1..d2d8e8a 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 6 +0 ipset create test hash:net,port hashsize 128 timeout 5 # Add zero valued element 1 ipset add test 0.0.0.0/0,0 # Test zero valued element @@ -38,8 +38,8 @@ 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # Check listing 0 diff -I 'Size in memory.*' .foo hash:net,port.t.list0 -# Sleep 6s so that element can time out -0 sleep 6 +# Sleep 5s so that element can time out +0 sleep 5 # IP: List set 0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0 # IP: Check listing diff --git a/tests/hash:net,port.t.list1 b/tests/hash:net,port.t.list1 index 20d38a8..c049cf7 100644 --- a/tests/hash:net,port.t.list1 +++ b/tests/hash:net,port.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:net,port -Header: family inet hashsize 128 maxelem 65536 timeout 6 +Header: family inet hashsize 128 maxelem 65536 timeout 5 Size in memory: 2000 References: 0 Members: diff --git a/tests/hash:net.t b/tests/hash:net.t index c27bb65..9edd3c9 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 6 +0 ipset create test nethash hashsize 128 timeout 5 # Add zero valued element 1 ipset add test 0.0.0.0/0 # Test zero valued element @@ -36,8 +36,8 @@ 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # Check listing 0 diff -I 'Size in memory.*' .foo hash:net.t.list0 && rm .foo -# Sleep 6s so that element can time out -0 sleep 6 +# Sleep 5s so that element can time out +0 sleep 5 # IP: List set 0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0 # IP: Check listing diff --git a/tests/hash:net.t.list1 b/tests/hash:net.t.list1 index 7dec348..515a93c 100644 --- a/tests/hash:net.t.list1 +++ b/tests/hash:net.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:net -Header: family inet hashsize 128 maxelem 65536 timeout 6 +Header: family inet hashsize 128 maxelem 65536 timeout 5 Size in memory: 1672 References: 0 Members: diff --git a/tests/hash:net6,port.t b/tests/hash:net6,port.t index bfb6f27..099c4f5 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 6 +0 ipset create test hash:net,port family inet6 hashsize 128 timeout 5 # Add zero valued element 1 ipset add test ::/0,tcp:8 # Test zero valued element @@ -38,8 +38,8 @@ 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # Check listing 0 diff -I 'Size in memory.*' .foo hash:net6,port.t.list0 && rm .foo -# Sleep 6s so that element can time out -0 sleep 6 +# Sleep 5s so that element can time out +0 sleep 5 # IP: List set 0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0 # IP: Check listing diff --git a/tests/hash:net6,port.t.list1 b/tests/hash:net6,port.t.list1 index 873788e..31c3eca 100644 --- a/tests/hash:net6,port.t.list1 +++ b/tests/hash:net6,port.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:net,port -Header: family inet6 hashsize 128 maxelem 65536 timeout 6 +Header: family inet6 hashsize 128 maxelem 65536 timeout 5 Size in memory: 2328 References: 0 Members: diff --git a/tests/hash:net6.t b/tests/hash:net6.t index f1ae092..ecb415e 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 6 +0 ipset create test nethash family inet6 hashsize 128 timeout 5 # Add zero valued element 1 ipset add test ::/0 # Test zero valued element @@ -36,8 +36,8 @@ 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # Check listing 0 diff -I 'Size in memory.*' .foo hash:net6.t.list0 && rm .foo -# Sleep 6s so that element can time out -0 sleep 6 +# Sleep 5s so that element can time out +0 sleep 5 # IP: List set 0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0 # IP: Check listing diff --git a/tests/hash:net6.t.list1 b/tests/hash:net6.t.list1 index 2a606bc..05d4746 100644 --- a/tests/hash:net6.t.list1 +++ b/tests/hash:net6.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:net -Header: family inet6 hashsize 128 maxelem 65536 timeout 6 +Header: family inet6 hashsize 128 maxelem 65536 timeout 5 Size in memory: 2696 References: 0 Members: diff --git a/tests/macipmap.t b/tests/macipmap.t index 7cf0cff..ddc1393 100644 --- a/tests/macipmap.t +++ b/tests/macipmap.t @@ -87,11 +87,11 @@ # Network: Delete test set 0 ipset -X test # Range: Create a set from a valid range with timeout -0 ipset -N test macipmap --from 2.0.0.1 --to 2.1.0.0 timeout 10 +0 ipset -N test macipmap --from 2.0.0.1 --to 2.1.0.0 timeout 5 # Range: Add lower boundary -0 ipset -A test 2.0.0.1 timeout 8 +0 ipset -A test 2.0.0.1 timeout 4 # Range: Add upper boundary -0 ipset -A test 2.1.0.0 timeout 5 +0 ipset -A test 2.1.0.0 timeout 3 # Range: Test lower boundary 0 ipset -T test 2.0.0.1 # Range: Test upper boundary @@ -107,7 +107,7 @@ # Range: Try to add value after upper boundary 1 ipset -A test 2.1.0.1 # Range: Try to add value with MAC -0 ipset -A test 2.0.0.2,00:11:22:33:44:55 timeout 8 +0 ipset -A test 2.0.0.2,00:11:22:33:44:55 timeout 4 # Range: Test value with invalid MAC 1 ipset -T test 2.0.0.2,00:11:22:33:44:56 # Range: Test value with valid MAC @@ -122,10 +122,10 @@ 0 ipset -L test | sed 's/timeout ./timeout x/' > .foo # Range: Check listing 0 diff -I 'Size in memory.*' .foo macipmap.t.list3 && rm .foo -# Range: wait 10s so that elements can timeout -0 sleep 10 +# Range: sleep 5s so that elements can timeout +0 sleep 5 # Range: List set -0 ipset -L test > .foo +0 ipset -L test | sed 's/timeout ./timeout x/' > .foo # Range: Check listing 0 diff -I 'Size in memory.*' .foo macipmap.t.list2 && rm .foo # Range: Flush test set diff --git a/tests/macipmap.t.list2 b/tests/macipmap.t.list2 index 6a727d8..f154a52 100644 --- a/tests/macipmap.t.list2 +++ b/tests/macipmap.t.list2 @@ -1,8 +1,8 @@ Name: test Type: bitmap:ip,mac -Header: range 2.0.0.1-2.1.0.0 timeout 10 +Header: range 2.0.0.1-2.1.0.0 timeout x Size in memory: 1048688 References: 0 Members: -2.1.0.0 timeout 5 +2.1.0.0 timeout x diff --git a/tests/macipmap.t.list3 b/tests/macipmap.t.list3 index 9f52f06..04b66b5 100644 --- a/tests/macipmap.t.list3 +++ b/tests/macipmap.t.list3 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip,mac -Header: range 2.0.0.1-2.1.0.0 timeout x0 +Header: range 2.0.0.1-2.1.0.0 timeout x Size in memory: 1048688 References: 0 Members: diff --git a/tests/portmap.t b/tests/portmap.t index 54fd6f1..989a83b 100644 --- a/tests/portmap.t +++ b/tests/portmap.t @@ -53,7 +53,7 @@ # Full: Delete test set 0 ipset -X test # Full: Create a full set of ports and timeout -0 ipset -N test portmap --from 0 --to 65535 timeout 8 +0 ipset -N test portmap --from 0 --to 65535 timeout 5 # Full: Add lower boundary 0 ipset -A test 0 timeout 5 # Full: Add upper boundary @@ -72,8 +72,8 @@ 0 ipset -L test | sed 's/timeout ./timeout x/' > .foo # Full: Check listing 0 diff -I 'Size in memory.*' .foo portmap.t.list3 && rm .foo -# Full: sleep 10s so that elements can timeout -0 sleep 10 +# Full: sleep 5s so that elements can timeout +0 sleep 5 # Full: List set 0 ipset -L test > .foo # Full: Check listing -- cgit v1.2.3