summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-04-18 13:19:59 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-04-18 13:25:13 +0200
commit42d44fcb9c938bac9e144ec862ee00459820f271 (patch)
tree22567ffb331186ae9d946d1806c9aa3c82d10ea4 /tests
parent0b6f88e662d54cabf15ef3dbf70e9f0fcdb1412e (diff)
Fix order of listing of sets
A restoreable saving of sets requires that list:set type of sets come last and the code part which should have taken into account the ordering was broken. The patch fixes the listing order. Testsuite entry added which checks the listing order.
Diffstat (limited to 'tests')
-rw-r--r--tests/setlist.t4
-rw-r--r--tests/setlist.t.before1
-rw-r--r--tests/setlist.t.list436
3 files changed, 41 insertions, 0 deletions
diff --git a/tests/setlist.t b/tests/setlist.t
index 0430741..90c78f2 100644
--- a/tests/setlist.t
+++ b/tests/setlist.t
@@ -80,6 +80,10 @@
0 ipset list test > .foo
# Check listing
0 diff -u -I 'Size in memory.*' .foo setlist.t.list3
+# List all sets
+0 ipset list > .foo
+# Check listing
+0 diff -u -I 'Size in memory.*' .foo setlist.t.list4
# Flush sets
0 ipset flush
# Destroy sets
diff --git a/tests/setlist.t.before b/tests/setlist.t.before
index 59ee644..64ed849 100644
--- a/tests/setlist.t.before
+++ b/tests/setlist.t.before
@@ -2,3 +2,4 @@ create a hash:ip
create b hash:ip
create c hash:ip
create test list:set
+create d hash:ip
diff --git a/tests/setlist.t.list4 b/tests/setlist.t.list4
new file mode 100644
index 0000000..f867508
--- /dev/null
+++ b/tests/setlist.t.list4
@@ -0,0 +1,36 @@
+Name: a
+Type: hash:ip
+Header: family inet hashsize 1024 maxelem 65536
+Size in memory: 16504
+References: 1
+Members:
+
+Name: b
+Type: hash:ip
+Header: family inet hashsize 1024 maxelem 65536
+Size in memory: 16504
+References: 0
+Members:
+
+Name: c
+Type: hash:ip
+Header: family inet hashsize 1024 maxelem 65536
+Size in memory: 16504
+References: 0
+Members:
+
+Name: d
+Type: hash:ip
+Header: family inet hashsize 1024 maxelem 65536
+Size in memory: 16504
+References: 0
+Members:
+
+Name: test
+Type: list:set
+Header: size 8
+Size in memory: 112
+References: 0
+Members:
+a
+