tests: shell: fix failed tests due to missing quotes
PATCH 1/1 tests: shell: fix failed tests due to missing quotes
Add double quotes to protect newlines when using <<< redirection.
See also commit b878cb7d83855.
Signed-off-by Eric Jallot <[email protected]>
--- tests/shell/testcases/flowtable/0001flowtable_0 | 2 +- tests/shell/testcases/listing/0015dynamic_0 | 2 +- tests/shell/testcases/listing/0017objects_0 | 2 +- tests/shell/testcases/listing/0018data_0 | 2 +- tests/shell/testcases/listing/0019set_0 | 2 +- tests/shell/testcases/maps/0007named_ifname_dtype_0 | 3 +-- tests/shell/testcases/nft-f/0002rollback_rule_0 | 4 ++-- tests/shell/testcases/nft-f/0003rollback_jump_0 | 4 ++-- tests/shell/testcases/nft-f/0004rollback_set_0 | 4 ++-- tests/shell/testcases/nft-f/0005rollback_map_0 | 4 ++-- tests/shell/testcases/nft-f/0006action_object_0 | 2 +- tests/shell/testcases/nft-f/0017ct_timeout_obj_0 | 2 +- tests/shell/testcases/nft-f/0018ct_expectation_obj_0 | 2 +- tests/shell/testcases/sets/0029named_ifname_dtype_0 | 2 +- 14 files changed, 18 insertions(+), 19 deletions(-)
tests/shell/testcases/flowtable/0001flowtable_0 +1 -1
@@ -12,4 +12,4 @@ EXPECTED='table inet t { }' set -e -$NFT -f - <<< $EXPECTED +$NFT -f - <<< "$EXPECTED"
tests/shell/testcases/listing/0015dynamic_0 +1 -1
@@ -12,7 +12,7 @@ EXPECTED="table ip filter { set -e -$NFT -f - <<< $EXPECTED +$NFT -f - <<< "$EXPECTED" GET="$($NFT list set ip filter test_set)" if [ "$EXPECTED" != "$GET" ] ; then
tests/shell/testcases/listing/0017objects_0 +1 -1
@@ -8,7 +8,7 @@ EXPECTED="table inet filter { set -e -$NFT -f - <<< $EXPECTED +$NFT -f - <<< "$EXPECTED" $NFT flush map inet filter countermap GET="$($NFT list map inet filter countermap)"
tests/shell/testcases/listing/0018data_0 +1 -1
@@ -8,7 +8,7 @@ EXPECTED="table inet filter { set -e -$NFT -f - <<< $EXPECTED +$NFT -f - <<< "$EXPECTED" $NFT flush map inet filter ipmap GET="$($NFT list map inet filter ipmap)"
tests/shell/testcases/listing/0019set_0 +1 -1
@@ -8,7 +8,7 @@ EXPECTED="table inet filter { set -e -$NFT -f - <<< $EXPECTED +$NFT -f - <<< "$EXPECTED" $NFT flush set inet filter ipset GET="$($NFT list set inet filter ipset)"
tests/shell/testcases/maps/0007named_ifname_dtype_0 +1 -2
@@ -15,5 +15,4 @@ EXPECTED="table inet t { }" set -e -$NFT -f - <<< $EXPECTED - +$NFT -f - <<< "$EXPECTED"
tests/shell/testcases/nft-f/0002rollback_rule_0 +2 -2
@@ -27,13 +27,13 @@ table ip t2 { } }" -$NFT -f - <<< $GOOD_RULESET +$NFT -f - <<< "$GOOD_RULESET" if [ $? -ne 0 ] ; then echo "E: unable to load good ruleset" >&2 exit 1 fi -$NFT -f - <<< $BAD_RULESET 2>/dev/null +$NFT -f - <<< "$BAD_RULESET" 2>/dev/null if [ $? -eq 0 ] ; then echo "E: bogus ruleset loaded?" >&2 exit 1
tests/shell/testcases/nft-f/0003rollback_jump_0 +2 -2
@@ -27,13 +27,13 @@ table ip t2 { } }" -$NFT -f - <<< $GOOD_RULESET +$NFT -f - <<< "$GOOD_RULESET" if [ $? -ne 0 ] ; then echo "E: unable to load good ruleset" >&2 exit 1 fi -$NFT -f - <<< $BAD_RULESET 2>/dev/null +$NFT -f - <<< "$BAD_RULESET" 2>/dev/null if [ $? -eq 0 ] ; then echo "E: bogus ruleset loaded?" >&2 exit 1
tests/shell/testcases/nft-f/0004rollback_set_0 +2 -2
@@ -27,13 +27,13 @@ table ip t2 { } }" -$NFT -f - <<< $GOOD_RULESET +$NFT -f - <<< "$GOOD_RULESET" if [ $? -ne 0 ] ; then echo "E: unable to load good ruleset" >&2 exit 1 fi -$NFT -f - <<< $BAD_RULESET 2>/dev/null +$NFT -f - <<< "$BAD_RULESET" 2>/dev/null if [ $? -eq 0 ] ; then echo "E: bogus ruleset loaded?" >&2 exit 1
tests/shell/testcases/nft-f/0005rollback_map_0 +2 -2
@@ -30,13 +30,13 @@ table ip t2 { } }" -$NFT -f - <<< $GOOD_RULESET +$NFT -f - <<< "$GOOD_RULESET" if [ $? -ne 0 ] ; then echo "E: unable to load good ruleset" >&2 exit 1 fi -$NFT -f - <<< $BAD_RULESET 2>/dev/null +$NFT -f - <<< "$BAD_RULESET" 2>/dev/null if [ $? -eq 0 ] ; then echo "E: bogus ruleset loaded?" >&2 exit 1
tests/shell/testcases/nft-f/0006action_object_0 +1 -1
@@ -40,7 +40,7 @@ RULESET=$(for family in $FAMILIES ; do generate1 $family done) -$NFT -f - <<< $RULESET +$NFT -f - <<< "$RULESET" if [ $? -ne 0 ] ; then echo "E: unable to load ruleset 1" >&2 exit 1
tests/shell/testcases/nft-f/0017ct_timeout_obj_0 +1 -1
@@ -13,4 +13,4 @@ EXPECTED='table ip filter { }' set -e -$NFT -f - <<< $EXPECTED +$NFT -f - <<< "$EXPECTED"
tests/shell/testcases/nft-f/0018ct_expectation_obj_0 +1 -1
@@ -15,4 +15,4 @@ EXPECTED='table ip filter { }' set -e -$NFT -f - <<< $EXPECTED +$NFT -f - <<< "$EXPECTED"
tests/shell/testcases/sets/0029named_ifname_dtype_0 +1 -1
@@ -21,4 +21,4 @@ EXPECTED="table inet t { }" set -e -$NFT -f - <<< $EXPECTED +$NFT -f - <<< "$EXPECTED"
Signature · 1 line
2.11.0
Quoted 5 lines · Eric Jallot
Add double quotes to protect newlines when using <<< redirection.
See also commit
b878cb7d83855.Signed-off-by Eric Jallot <[email protected]>
Applied, thanks!