sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-31 22:02:58 +03:00
Code Activity

testprogs: Reformat common_test_fns.inc

Browse Source 
shfmt -w -p -i 0 -fn testprogs/blackbox/common_test_fns.inc

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>

Autobuild-User(master): Pavel Filipensky <pfilipensky@samba.org>
Autobuild-Date(master): Wed Jul 20 11:59:26 UTC 2022 on sn-devel-184
This commit is contained in:
Andreas Schneider
2022-06-08 14:49:51 +02:00
committed by Pavel Filipensky
parent 88c1173655
commit 4c12840e42
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
testprogs/blackbox/common_test_fns.inc
View File

@ -1,7 +1,8 @@
# Common tests # Common tests
# Pulled out of existing tests to prevent duplication. # Pulled out of existing tests to prevent duplication.
# #
test_smbclient() { test_smbclient()
{
name="$1" name="$1"
cmd="$2" cmd="$2"
unc="$3" unc="$3"
@ -9,7 +10,7 @@ test_smbclient() {
shift shift
shift shift
subunit_start_test "$name" subunit_start_test "$name"
output=`$VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@ 2>&1` output=$($VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@ 2>&1)
status=$? status=$?
if [ x$status = x0 ]; then if [ x$status = x0 ]; then
subunit_pass_test "$name" subunit_pass_test "$name"
@ -19,7 +20,8 @@ test_smbclient() {
return $status return $status
} }
test_smbclient_expect_failure() { test_smbclient_expect_failure()
{
name="$1" name="$1"
cmd="$2" cmd="$2"
unc="$3" unc="$3"
@ -27,7 +29,7 @@ test_smbclient_expect_failure() {
shift shift
shift shift
subunit_start_test "$name" subunit_start_test "$name"
output=`$VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@ 2>&1` output=$($VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@ 2>&1)
status=$? status=$?
if [ x$status = x0 ]; then if [ x$status = x0 ]; then
printf '%s' "$output" | subunit_fail_test "$name" printf '%s' "$output" | subunit_fail_test "$name"
@ -37,7 +39,8 @@ test_smbclient_expect_failure() {
return $status return $status
} }
test_rpcclient_grep() { test_rpcclient_grep()
{
name="$1" name="$1"
cmd="$2" cmd="$2"
srv="$3" srv="$3"
@ -47,7 +50,7 @@ test_rpcclient_grep() {
shift shift
shift shift
subunit_start_test "$name" subunit_start_test "$name"
output=`$VALGRIND $rpcclient $CONFIGURATION "$srv" -c "$cmd" $@ 2>&1` output=$($VALGRIND $rpcclient $CONFIGURATION "$srv" -c "$cmd" $@ 2>&1)
status=$? status=$?
if [ x$status != x0 ]; then if [ x$status != x0 ]; then
printf '%s' "$output" | subunit_fail_test "$name" printf '%s' "$output" | subunit_fail_test "$name"
@ -63,7 +66,8 @@ test_rpcclient_grep() {
return $status return $status
} }
test_rpcclient_expect_failure_grep() { test_rpcclient_expect_failure_grep()
{
name="$1" name="$1"
cmd="$2" cmd="$2"
srv="$3" srv="$3"
@ -73,7 +77,7 @@ test_rpcclient_expect_failure_grep() {
shift shift
shift shift
subunit_start_test "$name" subunit_start_test "$name"
output=`$VALGRIND $rpcclient $CONFIGURATION "$srv" -c "$cmd" $@ 2>&1` output=$($VALGRIND $rpcclient $CONFIGURATION "$srv" -c "$cmd" $@ 2>&1)
status=$? status=$?
if [ x$status = x0 ]; then if [ x$status = x0 ]; then
printf '%s' "$output" | subunit_fail_test "$name" printf '%s' "$output" | subunit_fail_test "$name"
@ -89,7 +93,8 @@ test_rpcclient_expect_failure_grep() {
return $status return $status
} }
kerberos_kinit() { kerberos_kinit()
{
kinit_tool="${1}" kinit_tool="${1}"
principal="${2}" principal="${2}"
password="${3}" password="${3}"
@ -97,7 +102,7 @@ kerberos_kinit() {
kbase=$(basename ${kinit_tool}) kbase=$(basename ${kinit_tool})
if [ "${kbase}" = "samba4kinit" ]; then if [ "${kbase}" = "samba4kinit" ]; then
kpassfile=$(mktemp) kpassfile=$(mktemp)
echo $password > ${kpassfile} echo $password >${kpassfile}
$kinit_tool -c ${KRB5CCNAME} --password-file=${kpassfile} $@ $principal $kinit_tool -c ${KRB5CCNAME} --password-file=${kpassfile} $@ $principal
status=$? status=$?
rm -f ${kpassfile} rm -f ${kpassfile}
@ -108,7 +113,8 @@ kerberos_kinit() {
return $status return $status
} }
remove_directory() { remove_directory()
{
local xdir=${1} local xdir=${1}
shift shift