diff options
| author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2023-04-11 14:34:07 +1200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2023-04-12 13:52:32 +0000 |
| commit | 4726541a789f0df884387f27c63c307709535f24 (patch) | |
| tree | d62fef7613705a37ea44e83d1af5a754689e52ce /source3/script | |
| parent | ae5fafa902bd3b8564a0e36b75a8ddc7e156f1fa (diff) | |
| download | samba-4726541a789f0df884387f27c63c307709535f24.tar.gz | |
s3:script: Always return a non-zero status code on failure
If $expected didn't match $received, these functions would still return
zero.
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/script')
| -rwxr-xr-x | source3/script/tests/test_dfree_command.sh | 4 | ||||
| -rwxr-xr-x | source3/script/tests/test_dfree_quota.sh | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/source3/script/tests/test_dfree_command.sh b/source3/script/tests/test_dfree_command.sh index 423d6276a09..3ebb50c1ba1 100755 --- a/source3/script/tests/test_dfree_command.sh +++ b/source3/script/tests/test_dfree_command.sh @@ -41,13 +41,15 @@ test_smbclient_dfree() received=$(echo "$output" | awk '/blocks of size/ {print $1, $5, $6}') if [ "$expected" = "$received" ]; then subunit_pass_test "$name" + return 0 else echo "$output" | subunit_fail_test "$name" + return 1 fi else echo "$output" | subunit_fail_test "$name" + return $status fi - return $status } if [ $protocol = "SMB3" ]; then diff --git a/source3/script/tests/test_dfree_quota.sh b/source3/script/tests/test_dfree_quota.sh index bd036184c33..91510165029 100755 --- a/source3/script/tests/test_dfree_quota.sh +++ b/source3/script/tests/test_dfree_quota.sh @@ -128,13 +128,15 @@ test_smbclient_dfree() received=$(echo "$output" | awk '/blocks of size/ {print $1, $5, $6}') if [ "$expected" = "$received" ]; then subunit_pass_test "$name" + return 0 else echo "$output" | subunit_fail_test "$name" + return 1 fi else echo "$output" | subunit_fail_test "$name" + return $status fi - return $status } # Issue two queries to different directories in one session to test @@ -158,13 +160,15 @@ test_smbclient_dfree_2() tr '\n' ' ') if [ "$expected" = "$received" ]; then subunit_pass_test "$name" + return 0 else echo "$output" | subunit_fail_test "$name" + return 1 fi else echo "$output" | subunit_fail_test "$name" + return $status fi - return $status } test_smbcquotas() @@ -193,13 +197,15 @@ test_smbcquotas() received=$(echo "$output" | awk "/$SERVER\\/$user/ {printf \"%s%s%s\", \$3, \$4, \$5}") if [ "$expected" = "$received" ]; then subunit_pass_test "$name" + return 0 else echo "$output" | subunit_fail_test "$name" + return 1 fi else echo "$output" | subunit_fail_test "$name" + return $status fi - return $status } if [ $protocol != "SMB3" ] && [ $protocol != "NT1" ]; then |