sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-24 13:57:43 +03:00
Code

s3:script: Always return a non-zero status code on failure

Browse Source 
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>
This commit is contained in:
Joseph Sutton 2023-04-11 14:34:07 +12:00 committed by Andreas Schneider
parent ae5fafa902
commit 4726541a78
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/script/tests/test_dfree_command.sh
View File

@ -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

12
source3/script/tests/test_dfree_quota.sh
View File

@ -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