From: Andreas Schneider Date: Fri, 22 Apr 2022 13:34:08 +0000 (+0200) Subject: s3:tests: Reformat test_deadtime.sh X-Git-Tag: talloc-2.3.4~281 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45b648486b9751beba7500c25294b4f7671caf44;p=thirdparty%2Fsamba.git s3:tests: Reformat test_deadtime.sh shfmt -f source3/script/| xargs shfmt -w -p -i 0 -fn Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Tue May 3 00:10:53 UTC 2022 on sn-devel-184 --- diff --git a/source3/script/tests/test_deadtime.sh b/source3/script/tests/test_deadtime.sh index 68703008f02..3d6368e29fe 100755 --- a/source3/script/tests/test_deadtime.sh +++ b/source3/script/tests/test_deadtime.sh @@ -4,13 +4,13 @@ # if [ $# -lt 1 ]; then - echo Usage: test_deadtime.sh IP - exit 1 + echo Usage: test_deadtime.sh IP + exit 1 fi server=$1 -incdir=`dirname $0`/../../../testprogs/blackbox +incdir=$(dirname $0)/../../../testprogs/blackbox . $incdir/subunit.sh . $incdir/common_test_fns.inc @@ -21,7 +21,7 @@ smbcontrol="$BINDIR/smbcontrol" global_inject_conf=$(dirname $SMB_CONF_PATH)/global_inject.conf -echo "deadtime = 1" > $global_inject_conf +echo "deadtime = 1" >$global_inject_conf $smbcontrol smbd reload-config cd $SELFTEST_TMPDIR || exit 1 @@ -39,12 +39,12 @@ export SAMBA_DEPRECATED_SUPPRESS=1 trap "" SIGPIPE $smbclient //$server/tmp -U${USER}%${PASSWORD} \ - < smbclient-stdin > smbclient-stdout 2>smbclient-stderr & + smbclient-stdout 2>smbclient-stderr & client_pid=$! sleep 1 -exec 100>smbclient-stdin 101smbclient-stdin 101 $global_inject_conf +echo "" >$global_inject_conf $smbcontrol smbd reload-config rm -f smbclient-stdin smbclient-stdout smbclient-stderr