From 87f9c118a3ade11f0a60a07933275a68d3bbd0b8 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Tue, 14 Dec 2010 21:23:41 +0100 Subject: Fix outdated messages in the tests --- tests/hash:ip,port,ip.t | 16 ++++++++-------- tests/hash:ip,port.t | 16 ++++++++-------- tests/hash:ip6,port,ip6.t | 16 ++++++++-------- tests/hash:ip6,port,net6.t | 16 ++++++++-------- tests/hash:ip6,port.t | 16 ++++++++-------- tests/ipporthash.t | 32 ++++++++++++++++---------------- tests/ipportiphash.t | 34 +++++++++++++++++----------------- tests/ipportnethash.t | 32 ++++++++++++++++---------------- 8 files changed, 89 insertions(+), 89 deletions(-) (limited to 'tests') diff --git a/tests/hash:ip,port,ip.t b/tests/hash:ip,port,ip.t index 69411ca..b658b5d 100644 --- a/tests/hash:ip,port,ip.t +++ b/tests/hash:ip,port,ip.t @@ -12,13 +12,13 @@ 0 ipset test test 2.0.0.1,0,0.0.0.1 # Delete almost zero valued element 0 ipset del test 2.0.0.1,0,0.0.0.1 -# Add lower boundary +# Add first random value 0 ipset add test 2.0.0.1,5,1.1.1.1 -# Add upper boundary +# Add second random value 0 ipset add test 2.1.0.0,128,2.2.2.2 -# Test lower boundary +# Test first random value 0 ipset test test 2.0.0.1,5,1.1.1.1 -# Test upper boundary +# Test second random value 0 ipset test test 2.1.0.0,128,2.2.2.2 # Test value not added to the set 1 ipset test test 2.0.0.1,5,1.1.1.2 @@ -26,13 +26,13 @@ 1 ipset test test 2.0.0.1,6,1.1.1.1 # Test value not added to the set 1 ipset test test 2.0.0.2,6,1.1.1.1 -# Test value before lower boundary +# Test value before first random value 1 ipset test test 2.0.0.0,5,1.1.1.1 -# Test value after upper boundary +# Test value after second random value 1 ipset test test 2.1.0.1,128,2.2.2.2 -# Try to add value before lower boundary +# Try to add value before first random value 0 ipset add test 2.0.0.0,5,1.1.1.1 -# Try to add value after upper boundary +# Try to add value after second random value 0 ipset add test 2.1.0.1,128,2.2.2.2 # List set 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 diff --git a/tests/hash:ip,port.t b/tests/hash:ip,port.t index 53bf69d..7d2abca 100644 --- a/tests/hash:ip,port.t +++ b/tests/hash:ip,port.t @@ -6,25 +6,25 @@ 0 ipset test test 2.0.0.1,0 # Delete partly zero valued element 0 ipset del test 2.0.0.1,0 -# Add lower boundary +# Add first random value 0 ipset add test 2.0.0.1,5 -# Add upper boundary +# Add second random value 0 ipset add test 2.1.0.0,128 -# Test lower boundary +# Test first random value 0 ipset test test 2.0.0.1,5 -# Test upper boundary +# Test second random value 0 ipset test test 2.1.0.0,128 # Test value not added to the set 1 ipset test test 2.0.0.1,4 # Delete value not added to the set 1 ipset del test 2.0.0.1,6 -# Test value before lower boundary +# Test value before first random value 1 ipset test test 2.0.0.0,5 -# Test value after upper boundary +# Test value after second random value 1 ipset test test 2.1.0.1,128 -# Try to add value before lower boundary +# Try to add value before first random value 0 ipset add test 2.0.0.0,5 -# Try to add value after upper boundary +# Try to add value after second random value 0 ipset add test 2.1.0.1,128 # List set 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 diff --git a/tests/hash:ip6,port,ip6.t b/tests/hash:ip6,port,ip6.t index b4d05e9..bfdc298 100644 --- a/tests/hash:ip6,port,ip6.t +++ b/tests/hash:ip6,port,ip6.t @@ -12,13 +12,13 @@ 0 ipset test test 2:0:0::1,0,0:0:0::1 # Delete almost zero valued element 0 ipset del test 2:0:0::1,0,0:0:0::1 -# Add lower boundary +# Add first random value 0 ipset add test 2:0:0::1,5,1:1:1::1 -# Add upper boundary +# Add second random value 0 ipset add test 2:1:0::0,128,2:2:2::2 -# Test lower boundary +# Test first random value 0 ipset test test 2:0:0::1,5,1:1:1::1 -# Test upper boundary +# Test second random value 0 ipset test test 2:1:0::0,128,2:2:2::2 # Test value not added to the set 1 ipset test test 2:0:0::1,5,1:1:1::2 @@ -26,13 +26,13 @@ 1 ipset test test 2:0:0::1,6,1:1:1::1 # Test value not added to the set 1 ipset test test 2:0:0::2,6,1:1:1::1 -# Test value before lower boundary +# Test value before first random value 1 ipset test test 2:0:0::0,5,1:1:1::1 -# Test value after upper boundary +# Test value after second random value 1 ipset test test 2:1:0::1,128,2:2:2::2 -# Try to add value before lower boundary +# Try to add value before first random value 0 ipset add test 2:0:0::0,5,1:1:1::1 -# Try to add value after upper boundary +# Try to add value after second random value 0 ipset add test 2:1:0::1,128,2:2:2::2 # List set 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 diff --git a/tests/hash:ip6,port,net6.t b/tests/hash:ip6,port,net6.t index 0041b5d..4980b3b 100644 --- a/tests/hash:ip6,port,net6.t +++ b/tests/hash:ip6,port,net6.t @@ -12,13 +12,13 @@ 0 ipset -T test 2:0:0::1,0,0:0:0::0/24 # Range: Delete almost zero valued element 0 ipset -D test 2:0:0::1,0,0:0:0::0/24 -# Range: Add lower boundary +# Range: Add first random value 0 ipset -A test 2:0:0::1,5,1:1:1::1/24 -# Range: Add upper boundary +# Range: Add second random value 0 ipset -A test 2:1:0::0,128,2:2:2::2/12 -# Range: Test lower boundary +# Range: Test first random value 0 ipset -T test 2:0:0::1,5,1:1:1::2 -# Range: Test upper boundary +# Range: Test second random value 0 ipset -T test 2:1:0::0,128,2:2:2::0 # Range: Test value not added to the set 1 ipset -T test 2:0:0::1,5,2:1:1::255 @@ -26,13 +26,13 @@ 1 ipset -T test 2:0:0::1,6,1:1:1::1 # Range: Test value not added to the set 1 ipset -T test 2:0:0::2,6,1:1:1::1 -# Range: Test value before lower boundary +# Range: Test value before first random value 1 ipset -T test 2:0:0::0,5,1:1:1::1 -# Range: Test value after upper boundary +# Range: Test value after second random value 1 ipset -T test 2:1:0::1,128,2:2:2::2 -# Range: Try to add value before lower boundary +# Range: Try to add value before first random value 0 ipset -A test 2:0:0::0,5,1:1:1::1/24 -# Range: Try to add value after upper boundary +# Range: Try to add value after second random value 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 diff --git a/tests/hash:ip6,port.t b/tests/hash:ip6,port.t index fdd61da..ead59a5 100644 --- a/tests/hash:ip6,port.t +++ b/tests/hash:ip6,port.t @@ -6,25 +6,25 @@ 0 ipset test test 2:0:0::1,0 # Delete partly zero valued element 0 ipset del test 2:0:0::1,0 -# Add lower boundary +# Add first random value 0 ipset add test 2:0:0::1,5 -# Add upper boundary +# Add second random value 0 ipset add test 2:1:0::0,128 -# Test lower boundary +# Test first random value 0 ipset test test 2:0:0::1,5 -# Test upper boundary +# Test second random value 0 ipset test test 2:1:0::0,128 # Test value not added to the set 1 ipset test test 2:0:0::1,4 # Delete value not added to the set 1 ipset del test 2:0:0::1,6 -# Test value before lower boundary +# Test value before first random value 1 ipset test test 2:0:0::0,5 -# Test value after upper boundary +# Test value after second random value 1 ipset test test 2:1:0::1,128 -# Try to add value before lower boundary +# Try to add value before first random value 0 ipset add test 2:0:0::0,5 -# Try to add value after upper boundary +# Try to add value after second random value 0 ipset add test 2:1:0::1,128 # List set 0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 diff --git a/tests/ipporthash.t b/tests/ipporthash.t index 9847830..052ba9d 100644 --- a/tests/ipporthash.t +++ b/tests/ipporthash.t @@ -10,25 +10,25 @@ 0 ipset -T test 2.0.0.1,0 # Delete partly zero valued element 0 ipset -D test 2.0.0.1,0 -# Add lower boundary +# Add first random value 0 ipset -A test 2.0.0.1,5 -# Add upper boundary +# Add second random value 0 ipset -A test 2.1.0.0,128 -# Test lower boundary +# Test first random value 0 ipset -T test 2.0.0.1,5 -# Test upper boundary +# Test second random value 0 ipset -T test 2.1.0.0,128 # Test value not added to the set 1 ipset -T test 2.0.0.1,4 # Delete value not added to the set 1 ipset -D test 2.0.0.1,6 -# Test value before lower boundary +# Test value before first random value 1 ipset -T test 2.0.0.0,5 -# Test value after upper boundary +# Test value after second random value 1 ipset -T test 2.1.0.1,128 -# Try to add value before lower boundary +# Try to add value before first random value 0 ipset -A test 2.0.0.0,5 -# Try to add value after upper boundary +# Try to add value after second random value 0 ipset -A test 2.1.0.1,128 # List set 0 ipset -L test > .foo0 && ./sort.sh .foo0 @@ -40,25 +40,25 @@ 0 ipset -X test # Create a set from a network (network ignored) 0 ipset -N test ipporthash --network 2.0.0.0/16 -# Add lower boundary +# Add first random value 0 ipset -A test 2.0.0.0,5 -# Add upper boundary +# Add second random value 0 ipset -A test 2.0.255.255,128 -# Test lower boundary +# Test first random value 0 ipset -T test 2.0.0.0,5 -# Test upper boundary +# Test second random value 0 ipset -T test 2.0.255.255,128 # Test value not added to the set 1 ipset -T test 2.0.0.0,4 # Delete value not added to the set 1 ipset -D test 2.0.0.0,6 -# Test value before lower boundary +# Test value before first random value 1 ipset -T test 1.255.255.255,5 -# Test value after upper boundary +# Test value after second random value 1 ipset -T test 2.1.0.0,128 -# Try to add value before lower boundary +# Try to add value before first random value 0 ipset -A test 1.255.255.255,5 -# Try to add value after upper boundary +# Try to add value after second random value 0 ipset -A test 2.1.0.0,128 # List set 0 ipset -L test > .foo0 && ./sort.sh .foo0 diff --git a/tests/ipportiphash.t b/tests/ipportiphash.t index f6e79cc..bfde875 100644 --- a/tests/ipportiphash.t +++ b/tests/ipportiphash.t @@ -16,13 +16,13 @@ 0 ipset -T test 2.0.0.1,0,0.0.0.1 # Delete almost zero valued element 0 ipset -D test 2.0.0.1,0,0.0.0.1 -# Add lower boundary +# Add first random value 0 ipset -A test 2.0.0.1,5,1.1.1.1 -# Add upper boundary +# Add second random value 0 ipset -A test 2.1.0.0,128,2.2.2.2 -# Test lower boundary +# Test first random value 0 ipset -T test 2.0.0.1,5,1.1.1.1 -# Test upper boundary +# Test second random value 0 ipset -T test 2.1.0.0,128,2.2.2.2 # Test value not added to the set 1 ipset -T test 2.0.0.1,5,1.1.1.2 @@ -30,13 +30,13 @@ 1 ipset -T test 2.0.0.1,6,1.1.1.1 # Test value not added to the set 1 ipset -T test 2.0.0.2,6,1.1.1.1 -# Test value before lower boundary +# Test value before first random value 1 ipset -T test 2.0.0.0,5,1.1.1.1 -# Test value after upper boundary +# Test value after second random value 1 ipset -T test 2.1.0.1,128,2.2.2.2 -# Try to add value before lower boundary +# Try to add value before first random value 0 ipset -A test 2.0.0.0,5,1.1.1.1 -# Try to add value after upper boundary +# Try to add value after second random value 0 ipset -A test 2.1.0.1,128,2.2.2.2 # List set 0 ipset -L test > .foo0 && ./sort.sh .foo0 @@ -48,27 +48,27 @@ 0 ipset -X test # Create a set from a valid network (network ignored) 0 ipset -N test ipportiphash --network 2.0.0.0/16 -# Add lower boundary +# Add first random value 0 ipset -A test 2.0.0.0,5,1.1.1.1 -# Add upper boundary +# Add second random value 0 ipset -A test 2.0.255.255,128,2.2.2.2 -# Test lower boundary +# Test first random value 0 ipset -T test 2.0.0.0,5,1.1.1.1 -# Test upper boundary +# Test second random value 0 ipset -T test 2.0.255.255,128,2.2.2.2 # Test value not added to the set 1 ipset -T test 2.0.0.0,5,1.1.1.2 # Test value not added to the set 1 ipset -T test 2.0.0.0,6,1.1.1.1 -# Test value before lower boundary +# Test value before first random value 1 ipset -T test 1.255.255.255,5,1.1.1.1 -# Test value after upper boundary +# Test value after second random value 1 ipset -T test 2.1.0.0,128,2.2.2.2 -# Try to add value before lower boundary +# Try to add value before first random value 0 ipset -A test 1.255.255.255,5,1.1.1.1 -# Try to test value before lower boundary +# Try to test value before first random value 0 ipset -T test 1.255.255.255,5,1.1.1.1 -# Try to del value before lower boundary +# Try to del value before first random value 0 ipset -D test 1.255.255.255,5,1.1.1.1 # List set 0 ipset -L test > .foo0 && ./sort.sh .foo0 diff --git a/tests/ipportnethash.t b/tests/ipportnethash.t index 6aff583..818e3b0 100644 --- a/tests/ipportnethash.t +++ b/tests/ipportnethash.t @@ -12,13 +12,13 @@ 0 ipset -T test 2.0.0.1,0,0.0.0.0/24 # Range: Delete almost zero valued element 0 ipset -D test 2.0.0.1,0,0.0.0.0/24 -# Range: Add lower boundary +# Range: Add first random value 0 ipset -A test 2.0.0.1,5,1.1.1.1/24 -# Range: Add upper boundary +# Range: Add second random value 0 ipset -A test 2.1.0.0,128,2.2.2.2/12 -# Range: Test lower boundary +# Range: Test first random value 0 ipset -T test 2.0.0.1,5,1.1.1.2 -# Range: Test upper boundary +# Range: Test second random value 0 ipset -T test 2.1.0.0,128,2.2.2.0 # Range: Test value not added to the set 1 ipset -T test 2.0.0.1,5,1.1.0.255 @@ -26,13 +26,13 @@ 1 ipset -T test 2.0.0.1,6,1.1.1.1 # Range: Test value not added to the set 1 ipset -T test 2.0.0.2,6,1.1.1.1 -# Range: Test value before lower boundary +# Range: Test value before first random value 1 ipset -T test 2.0.0.0,5,1.1.1.1 -# Range: Test value after upper boundary +# Range: Test value after second random value 1 ipset -T test 2.1.0.1,128,2.2.2.2 -# Range: Try to add value before lower boundary +# Range: Try to add value before first random value 0 ipset -A test 2.0.0.0,5,1.1.1.1/24 -# Range: Try to add value after upper boundary +# Range: Try to add value after second random value 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 @@ -44,25 +44,25 @@ 0 ipset -X test # 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 +# Network: Add first random value 0 ipset -A test 2.0.0.0,5,1.1.1.1/24 -# Network: Add upper boundary +# Network: Add second random value 0 ipset -A test 2.0.255.255,128,2.2.2.2/12 -# Network: Test lower boundary +# Network: Test first random value 0 ipset -T test 2.0.0.0,5,1.1.1.2 -# Network: Test upper boundary +# Network: Test second random value 0 ipset -T test 2.0.255.255,128,2.2.2.0 # Network: Test value not added to the set 1 ipset -T test 2.0.0.0,5,1.1.0.255 # Network: Test value not added to the set 1 ipset -T test 2.0.0.0,6,1.1.1.1 -# Network: Test value before lower boundary +# Network: Test value before first random value 1 ipset -T test 1.255.255.255,5,1.1.1.1 -# Network: Test value after upper boundary +# Network: Test value after second random value 1 ipset -T test 2.1.0.0,128,2.2.2.2 -# Network: Try to add value before lower boundary +# Network: Try to add value before first random value 0 ipset -A test 1.255.255.255,5,1.1.1.1/24 -# Network: Try to add value after upper boundary +# Network: Try to add value after second random value 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 -- cgit v1.2.3