From 00e8bd9bb72eb1357aab486e314b83f93dad0d2c Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Mon, 21 Sep 2020 20:12:23 +0200 Subject: 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 --- tests/macipmap.t | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/macipmap.t') diff --git a/tests/macipmap.t b/tests/macipmap.t index 45783d6..074e067 100644 --- a/tests/macipmap.t +++ b/tests/macipmap.t @@ -39,9 +39,9 @@ # Range: Delete the same element 0 ipset -D test 2.0.200.214 # 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 macipmap.t.list0 +0 ./diff.sh .foo macipmap.t.list0 # Range: Flush test set 0 ipset -F test # Range: Catch invalid (too long) MAC @@ -87,9 +87,9 @@ # Network: Add MAC to already added element 0 ipset -A test 2.0.255.255,00:11:22:33:44:56 # Network: List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Network: Check listing -0 diff -u -I 'Size in memory.*' .foo macipmap.t.list1 +0 ./diff.sh .foo macipmap.t.list1 # Network: Flush test set 0 ipset -F test # Network: Delete test set @@ -127,15 +127,15 @@ # Range: Delete the same element 0 ipset -D test 2.0.200.214 # Range: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo +0 ipset -L test > .foo # Range: Check listing -0 diff -u -I 'Size in memory.*' .foo macipmap.t.list3 +0 ./diff.sh .foo macipmap.t.list3 # Range: sleep 5s so that elements can timeout 0 sleep 5 # Range: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo +0 ipset -L test > .foo # Range: Check listing -0 diff -u -I 'Size in memory.*' .foo macipmap.t.list2 +0 ./diff.sh .foo macipmap.t.list2 # Range: Flush test set 0 ipset -F test # Range: add element with 1s timeout -- cgit v1.2.3