From 4d26b6dd3c4c8354a88c4a1aef8ea33229f0a4cc Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Fri, 4 Jan 2019 15:57:00 +0100 Subject: tests: shell: change all test scripts to return 0 The shell-based tests currently encode a return value in the file name, i.e. foo_1 expects that the script should return '1' for the test case to pass. This is very error prone, and one test case is even broken (i.e., it returns 1, but because of a different, earlier error). do_something || exit 1 or 'set -e' are both pretty common patterns, in both cases tests should fail. In those test-cases that deliberately test for an error, nft something_should_fail || exit 0 nft something_should_fail && exit 1 or a similar constructs should be used. This initial commit modififies all '_1' scripts to return 0 on success, usually via 'nft wrong || exit 0'. All tests pass, except the one broken test case that hasn't worked before either, but where 'set -e' use made it pass (the failing command is supposed to work, and the command that is supposed to fail is never run). Signed-off-by: Florian Westphal --- tests/shell/testcases/maps/different_map_types_1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests/shell/testcases/maps') diff --git a/tests/shell/testcases/maps/different_map_types_1 b/tests/shell/testcases/maps/different_map_types_1 index b0a09d02..a7e831ff 100755 --- a/tests/shell/testcases/maps/different_map_types_1 +++ b/tests/shell/testcases/maps/different_map_types_1 @@ -6,5 +6,8 @@ set -e $NFT add table ip filter $NFT add chain ip filter output { type filter hook output priority 0 \; } -$NFT add rule ip filter output meta mark set tcp dport map { 22 : 1, 23 : 192.168.0.1 } + +$NFT add rule ip filter output meta mark set tcp dport map { 22 : 1, 23 : 192.168.0.1 } || exit 0 + echo "E: Added two different types of expression to map" +exit 1 -- cgit v1.2.3