tests: shell: Search diff tool once and for all
Phil Sutter
reviewerPATCH 1/2 tests: shell: Search diff tool once and for all
Instead of calling 'which diff' over and over again, just detect the tool's presence in run-tests.sh and pass $DIFF to each testcase just like with nft binary.
Fall back to using 'true' command to avoid the need for any conditional calling in test cases.
While being at it, unify potential diff calls so that a string comparison in shell happens irrespective of diff presence.
--- tests/shell/run-tests.sh | 7 ++++++- tests/shell/testcases/flowtable/0010delete_handle_0 | 3 +-- tests/shell/testcases/listing/0003table_0 | 6 ++---- tests/shell/testcases/listing/0004table_0 | 3 +-- tests/shell/testcases/listing/0005ruleset_ip_0 | 3 +-- tests/shell/testcases/listing/0006ruleset_ip6_0 | 3 +-- tests/shell/testcases/listing/0007ruleset_inet_0 | 3 +-- tests/shell/testcases/listing/0008ruleset_arp_0 | 3 +-- tests/shell/testcases/listing/0009ruleset_bridge_0 | 3 +-- tests/shell/testcases/listing/0010sets_0 | 3 +-- tests/shell/testcases/listing/0011sets_0 | 3 +-- tests/shell/testcases/listing/0012sets_0 | 3 +-- tests/shell/testcases/listing/0013objects_0 | 3 +-- tests/shell/testcases/listing/0014objects_0 | 6 ++---- tests/shell/testcases/listing/0015dynamic_0 | 3 +-- tests/shell/testcases/listing/0017objects_0 | 3 +-- tests/shell/testcases/listing/0018data_0 | 3 +-- tests/shell/testcases/listing/0019set_0 | 3 +-- tests/shell/testcases/listing/0020flowtable_0 | 3 +-- .../shell/testcases/maps/0003map_add_many_elements_0 | 3 +-- .../testcases/maps/0004interval_map_create_once_0 | 3 +-- tests/shell/testcases/maps/0008interval_map_delete_0 | 3 +-- tests/shell/testcases/netns/0001nft-f_0 | 3 +-- tests/shell/testcases/netns/0002loosecommands_0 | 3 +-- tests/shell/testcases/netns/0003many_0 | 3 +-- tests/shell/testcases/nft-f/0016redefines_1 | 3 +-- .../testcases/optionals/delete_object_handles_0 | 3 +-- .../testcases/optionals/update_object_handles_0 | 3 +-- .../rule_management/0001addinsertposition_0 | 12 ++++-------- tests/shell/testcases/sets/0028delete_handle_0 | 3 +-- .../testcases/sets/0036add_set_element_expiration_0 | 5 ++++- tests/shell/testcases/transactions/0003table_0 | 4 +--- tests/shell/testcases/transactions/0040set_0 | 3 +-- 33 files changed, 46 insertions(+), 75 deletions(-)
tests/shell/run-tests.sh +6 -1
@@ -43,6 +43,11 @@ if [ ! -x "$MODPROBE" ] ; then msg_error "no modprobe binary found" fi +DIFF="$(which diff)" +if [ ! -x "$DIFF" ] ; then + DIFF=true +fi + if [ "$1" == "-v" ] ; then VERBOSE=y shift
@@ -96,7 +101,7 @@ do kernel_cleanup msg_info "[EXECUTING] $testfile" - test_output=$(NFT=$NFT ${testfile} 2>&1) + test_output=$(NFT=$NFT DIFF=$DIFF ${testfile} 2>&1) rc_got=$? echo -en "\033[1A\033[K" # clean the [EXECUTING] foobar line
tests/shell/testcases/flowtable/0010delete_handle_0 +1 -2
@@ -16,7 +16,6 @@ EXPECTED="table inet t { GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0003table_0 +2 -4
@@ -11,15 +11,13 @@ $NFT add table test GET="$($NFT list table test)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi # also this way GET="$($NFT list table ip test)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0004table_0 +1 -2
@@ -12,8 +12,7 @@ $NFT add table test2 GET="$($NFT list table test)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0005ruleset_ip_0 +1 -2
@@ -15,7 +15,6 @@ $NFT add table bridge test GET="$($NFT list ruleset ip)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0006ruleset_ip6_0 +1 -2
@@ -15,7 +15,6 @@ $NFT add table bridge test GET="$($NFT list ruleset ip6)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0007ruleset_inet_0 +1 -2
@@ -15,7 +15,6 @@ $NFT add table bridge test GET="$($NFT list ruleset inet)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0008ruleset_arp_0 +1 -2
@@ -15,7 +15,6 @@ $NFT add table bridge test GET="$($NFT list ruleset arp)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0009ruleset_bridge_0 +1 -2
@@ -15,7 +15,6 @@ $NFT add table bridge test GET="$($NFT list ruleset bridge)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0010sets_0 +1 -2
@@ -57,7 +57,6 @@ $NFT add set inet filter set2 { type icmpv6_type \; } GET="$($NFT list sets)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0011sets_0 +1 -2
@@ -38,7 +38,6 @@ $NFT add rule inet filter test tcp dport {80, 443} GET="$($NFT list sets)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0012sets_0 +1 -2
@@ -33,7 +33,6 @@ $NFT add set inet filter set2 { type icmpv6_type \; } GET="$($NFT list sets inet)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0013objects_0 +1 -2
@@ -42,7 +42,6 @@ $NFT add table test-ip GET="$($NFT list table test)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0014objects_0 +2 -4
@@ -17,15 +17,13 @@ $NFT add table test-ip GET="$($NFT list quotas)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi GET="$($NFT list quota test https-quota)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0015dynamic_0 +1 -2
@@ -16,8 +16,7 @@ $NFT -f - <<< "$EXPECTED" GET="$($NFT list set ip filter test_set)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0017objects_0 +1 -2
@@ -13,7 +13,6 @@ $NFT flush map inet filter countermap GET="$($NFT list map inet filter countermap)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0018data_0 +1 -2
@@ -13,7 +13,6 @@ $NFT flush map inet filter ipmap GET="$($NFT list map inet filter ipmap)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0019set_0 +1 -2
@@ -13,7 +13,6 @@ $NFT flush set inet filter ipset GET="$($NFT list set inet filter ipset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/listing/0020flowtable_0 +1 -2
@@ -15,7 +15,6 @@ $NFT -f - <<< "$EXPECTED" GET="$($NFT list flowtable inet filter f)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/maps/0003map_add_many_elements_0 +1 -2
@@ -61,8 +61,7 @@ EXPECTED="table ip x { }" GET=$($NFT list ruleset) if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/maps/0004interval_map_create_once_0 +1 -2
@@ -60,8 +60,7 @@ EXPECTED="table ip x { }" GET=$($NFT list ruleset) if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/maps/0008interval_map_delete_0 +1 -2
@@ -26,7 +26,6 @@ $NFT add element filter m { 127.0.0.2 : 0x2 } GET=$($NFT -s list ruleset) if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/netns/0001nft-f_0 +1 -2
@@ -93,8 +93,7 @@ fi KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset)" $IP netns del $NETNS_NAME if [ "$RULESET" != "$KERNEL_RULESET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") + $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") exit 1 fi exit 0
tests/shell/testcases/netns/0002loosecommands_0 +1 -2
@@ -56,7 +56,6 @@ RULESET="table ip t { KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset)" $IP netns del $NETNS_NAME if [ "$RULESET" != "$KERNEL_RULESET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") + $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") exit 1 fi
tests/shell/testcases/netns/0003many_0 +1 -2
@@ -97,8 +97,7 @@ function test_netns() KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset)" if [ "$RULESET" != "$KERNEL_RULESET" ] ; then echo "E: ruleset in netns $NETNS_NAME differs from the loaded" >&2 - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") + $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") $IP netns del $NETNS_NAME exit 1 fi
tests/shell/testcases/nft-f/0016redefines_1 +1 -2
@@ -26,8 +26,7 @@ $NFT -f - <<< "$RULESET" GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/optionals/delete_object_handles_0 +1 -2
@@ -37,7 +37,6 @@ table ip6 test-ip6 { GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/optionals/update_object_handles_0 +1 -2
@@ -19,7 +19,6 @@ EXPECTED="table ip test-ip { GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/rule_management/0001addinsertposition_0 +4 -8
@@ -30,8 +30,7 @@ for arg in "position 2" "handle 2" "index 0"; do GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi done
@@ -42,8 +41,7 @@ for arg in "position 3" "handle 3" "index 1"; do GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi done
@@ -62,8 +60,7 @@ for arg in "position 3" "handle 3" "index 1"; do GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi done
@@ -82,8 +79,7 @@ for arg in "position 2" "handle 2" "index 0"; do GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi done
tests/shell/testcases/sets/0028delete_handle_0 +1 -2
@@ -29,7 +29,6 @@ EXPECTED="table ip test-ip { GET="$($NFT list ruleset)" if [ "$EXPECTED" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") exit 1 fi
tests/shell/testcases/sets/0036add_set_element_expiration_0 +4 -1
@@ -8,6 +8,9 @@ add element ip x y { 1.1.1.1 timeout 30s expires 15s }" test_output=$($NFT -e -f - <<< "$RULESET" 2>&1) -diff -u <(echo "$test_output") <(echo "$RULESET") +if [ "$test_output" != "$RULESET" ] ; then + $DIFF -u <(echo "$test_output") <(echo "$RULESET") + exit 1 +fi $NFT "add chain ip x c; add rule ip x c ip saddr @y"
tests/shell/testcases/transactions/0003table_0 +1 -3
@@ -14,7 +14,6 @@ fi KERNEL_RULESET="$($NFT list ruleset)" if [ "" != "$KERNEL_RULESET" ] ; then - DIFF="$(which diff)" echo "Got a ruleset, but expected empty: " echo "$KERNEL_RULESET" exit 1
@@ -42,7 +41,6 @@ $NFT -f - <<< "$RULESETFAIL" && exit 2 KERNEL_RULESET="$($NFT list ruleset)" if [ "$RULESET" != "$KERNEL_RULESET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") + $DIFF -u <(echo "$RULESET") <(echo "$KERNEL_RULESET") exit 1 fi
tests/shell/testcases/transactions/0040set_0 +1 -2
@@ -29,8 +29,7 @@ fi GET="$($NFT list ruleset)" if [ "$RULESET" != "$GET" ] ; then - DIFF="$(which diff)" - [ -x $DIFF ] && $DIFF -u <(echo "$RULESET") <(echo "$GET") + $DIFF -u <(echo "$RULESET") <(echo "$GET") exit 1 fi
Signature · 1 line
2.24.1
Phil Sutter
reviewerPATCH 2/2 cache: Fix for doubled output after reset command
Reset command causes a dump of the objects to reset and adds those to cache. Yet it ignored if the object in question was already there and up to now CMD_RESET was flagged as NFT_CACHE_FULL.
Tackle this from two angles: First, reduce cache requirements of reset command to the necessary bits which is table cache. This alone would suffice if there wasn't interactive mode (and other libnftables users):
A cache containing the objects to reset might be in place already, so add dumped objects to cache only if they don't exist already.
--- src/cache.c | 4 +++- src/rule.c | 3 ++- tests/shell/testcases/sets/0024named_objects_0 | 12 +++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-)
src/cache.c +3 -1
@@ -138,8 +138,10 @@ unsigned int cache_evaluate(struct nft_ctx *nft, struct list_head *cmds)case CMD_GET : flags =evaluate_cache_get (cmd, flags);break ; -case CMD_LIST :case CMD_RESET : + flags |=NFT_CACHE_TABLE ; +break ; +case CMD_LIST :case CMD_EXPORT :case CMD_MONITOR : flags |=NFT_CACHE_FULL ;
src/rule.c +2 -1
@@ -2582,7 +2582,8 @@ static int do_command_reset(struct netlink_ctx *ctx, struct cmd *cmd) ret =netlink_reset_objs (ctx, cmd, type, dump);list_for_each_entry_safe (obj, next, &ctx->list, list) { table =table_lookup (&obj->handle, &ctx->nft->cache); -list_move (&obj->list, &table->objs); +if (!obj_lookup (table, obj->handle.obj.name, obj->type)) +list_move (&obj->list, &table->objs); }if (ret <0 )return ret;
tests/shell/testcases/sets/0024named_objects_0 +11 -1
@@ -35,4 +35,14 @@ table inet x { set -e $NFT -f - <<< "$RULESET" -$NFT reset counter inet x user321 +EXPECTED="table inet x { + counter user321 { + packets 12 bytes 1433 + } +}" + +GET="$($NFT reset counter inet x user321)" +if [ "$EXPECTED" != "$GET" ] ; then + $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + exit 1 +fi
Signature · 1 line
2.24.1
Re: [nft PATCH 2/2] cache: Fix for doubled output after reset command
Quoted 11 lines · Phil Sutter
Reset command causes a dump of the objects to reset and adds those to cache. Yet it ignored if the object in question was already there and up to now
CMD_RESETwas flagged asNFT_CACHE_FULL.Tackle this from two angles: First, reduce cache requirements of reset command to the necessary bits which is table cache. This alone would suffice if there wasn't interactive mode (and other libnftables users):
A cache containing the objects to reset might be in place already, so add dumped objects to cache only if they don't exist already.Signed-off-by Phil Sutter <[email protected]>
Quoted 11 lines · Phil Sutter
Instead of calling 'which diff' over and over again, just detect the tool's presence in
run-tests.shand pass $DIFF to each testcase just like with nft binary.Fall back to using 'true' command to avoid the need for any conditional calling in test cases.
While being at it, unify potential diff calls so that a string comparison in shell happens irrespective of diff presence.
Signed-off-by Phil Sutter <[email protected]>