summaryrefslogtreecommitdiffstats
path: root/tests/portmap.t
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@netfilter.org>2020-09-21 20:12:23 +0200
committerJozsef Kadlecsik <kadlec@netfilter.org>2020-09-21 20:12:23 +0200
commit00e8bd9bb72eb1357aab486e314b83f93dad0d2c (patch)
tree2222d756d82d88a0872688ca61cdadd147a84ddb /tests/portmap.t
parentde340a7f1a9cf21931d94ea8814545c4b2d172b0 (diff)
Handle all variable header parts in helper scripts instead ot test tasks
Thus the tests tasks can be simplified and all exceptions can be handled in the helper scripts. Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Diffstat (limited to 'tests/portmap.t')
-rw-r--r--tests/portmap.t16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/portmap.t b/tests/portmap.t
index 5eeaaff..819a59b 100644
--- a/tests/portmap.t
+++ b/tests/portmap.t
@@ -25,9 +25,9 @@
# Range: Delete the same element
0 ipset -D test 567
# Range: List set
-0 ipset -L test | grep -v Revision: > .foo
+0 ipset -L test > .foo
# Range: Check listing
-0 diff -u -I 'Size in memory.*' .foo portmap.t.list0
+0 ./diff.sh .foo portmap.t.list0
# Range: Flush test set
0 ipset -F test
# Range: Delete test set
@@ -45,9 +45,9 @@
# Full: Test value not added to the set
1 ipset -T test 1
# Full: List set
-0 ipset -L test | grep -v Revision: > .foo
+0 ipset -L test > .foo
# Full: Check listing
-0 diff -u -I 'Size in memory.*' .foo portmap.t.list1
+0 ./diff.sh .foo portmap.t.list1
# Full: Flush test set
0 ipset -F test
# Full: Delete test set
@@ -69,15 +69,15 @@
# Full: Delete the same element
0 ipset -D test 567
# Full: List set
-0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo
+0 ipset -L test > .foo
# Full: Check listing
-0 diff -u -I 'Size in memory.*' .foo portmap.t.list3
+0 ./diff.sh .foo portmap.t.list3
# Full: sleep 5s so that elements can timeout
0 sleep 5
# Full: List set
-0 ipset -L test | grep -v Revision: > .foo
+0 ipset -L test > .foo
# Full: Check listing
-# 0 diff -u -I 'Size in memory.*' .foo portmap.t.list2
+# 0 ./diff.sh .foo portmap.t.list2
# Full: Flush test set
0 ipset -F test
# Full: add element with 1s timeout