sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r7495: used --maximum-runtime=300 for each smbtorture call, to prevent it

Browse Source 
running too long
This commit is contained in:
Andrew Tridgell 2005-06-12 01:36:56 +00:00 committed by Gerald (Jerry) Carter
parent 5cccf0a770
commit 3d70755abf
9 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/script/tests/selftest.sh
View File

@ -68,6 +68,11 @@ fi
smbd_check_or_start smbd_check_or_start
# ensure any one smbtorture call doesn't run too long
TORTURE_OPTIONS="--maximum-runtime=300"
export TORTURE_OPTIONS
START=`date` START=`date`
( (
# give time for nbt server to register its names # give time for nbt server to register its names

2
source/script/tests/test_binding_string.sh
View File

@ -28,7 +28,7 @@ for I in "ncacn_np:$server" \
"308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_np:$server" \ "308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_np:$server" \
"308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_ip_tcp:$server" "308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_ip_tcp:$server"
do do
testit "$I" bin/smbtorture "$I" -U"$username"%"$password" -W $domain RPC-ECHO "$*" || failed=`expr $failed + 1` testit "$I" bin/smbtorture $TORTURE_OPTIONS "$I" -U"$username"%"$password" -W $domain RPC-ECHO "$*" || failed=`expr $failed + 1`
done done
testok $0 $failed testok $0 $failed

4
source/script/tests/test_echo.sh
View File

@ -34,13 +34,13 @@ for transport in $transports; do
"--option=ntlmssp_client:ntlm2=no --option=ntlmssp_client:keyexchange=no --option=torture:echo_TestSleep=no" \ "--option=ntlmssp_client:ntlm2=no --option=ntlmssp_client:keyexchange=no --option=torture:echo_TestSleep=no" \
; do ; do
name="$transport with $bindoptions and $ntlmoptions" name="$transport with $bindoptions and $ntlmoptions"
testit "$name" bin/smbtorture $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*" || failed=`expr $failed + 1` testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*" || failed=`expr $failed + 1`
done done
done done
done done
# separately test the print option - its v slow # separately test the print option - its v slow
name="print option" name="print option"
testit "$name" bin/smbtorture ncacn_np:"$server[print]" -U"$username"%"$password" -W $domain RPC-ECHO "$*" || failed=`expr $failed + 1` testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server[print]" -U"$username"%"$password" -W $domain RPC-ECHO "$*" || failed=`expr $failed + 1`
testok $0 $failed testok $0 $failed

2
source/script/tests/test_functions.sh
View File

@ -19,7 +19,7 @@ smbd_check_or_start() {
echo -n "STARTING SMBD..." echo -n "STARTING SMBD..."
(( ((
$SRCDIR/bin/smbd -d1 -s $CONFFILE -M single -i < $SMBD_TEST_FIFO > $SMBD_TEST_LOG 2>&1; $SRCDIR/bin/smbd --maximum-runtime=1800 -d1 -s $CONFFILE -M single -i < $SMBD_TEST_FIFO > $SMBD_TEST_LOG 2>&1;
ret=$?; ret=$?;
rm -f $SMBD_TEST_FIFO; rm -f $SMBD_TEST_FIFO;
if [ -n "$SOCKET_WRAPPER_DIR" -a -d "$SOCKET_WRAPPER_DIR" ]; then if [ -n "$SOCKET_WRAPPER_DIR" -a -d "$SOCKET_WRAPPER_DIR" ]; then

2
source/script/tests/test_ldap.sh
View File

@ -19,5 +19,5 @@ echo "Listing Groups"
ldbsearch -H ldap://$SERVER -b "$BASEDN" '(objectclass=group)' sAMAccountName || exit 1 ldbsearch -H ldap://$SERVER -b "$BASEDN" '(objectclass=group)' sAMAccountName || exit 1
echo "CLDAP test" echo "CLDAP test"
bin/smbtorture //$SERVER/_none_ LDAP-CLDAP || exit 1 bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ LDAP-CLDAP || exit 1

2
source/script/tests/test_local.sh
View File

@ -23,7 +23,7 @@ export SMBD_TEST_FIFO
failed=0 failed=0
for t in $local_tests; do for t in $local_tests; do
name="$t" name="$t"
testit "$name" $VALGRIND bin/smbtorture ncalrpc: $t "$*" || failed=`expr $failed + 1` testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncalrpc: $t "$*" || failed=`expr $failed + 1`
done done
testok $0 $failed testok $0 $failed

2
source/script/tests/test_posix.sh
View File

@ -46,7 +46,7 @@ for t in $tests; do
fi fi
start="" start=""
name="$t" name="$t"
testit "$name" $VALGRIND bin/smbtorture $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1` testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
done done
testok $0 $failed testok $0 $failed

2
source/script/tests/test_rpc.sh
View File

@ -36,7 +36,7 @@ for bindoptions in connect sign seal sign,seal spnego spnego,sign spnego,seal va
esac esac
for t in $tests; do for t in $tests; do
name="$t on $transport with $bindoptions" name="$t on $transport with $bindoptions"
testit "$name" $VALGRIND bin/smbtorture $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*" || failed=`expr $failed + 1` testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*" || failed=`expr $failed + 1`
done done
done done
done done

8
source/script/tests/test_w2k3.sh
View File

@ -33,7 +33,7 @@ OPTIONS="-U$username%$password -W $domain --option realm=$realm"
failed=0 failed=0
name="RPC-SPOOLSS on ncacn_np" name="RPC-SPOOLSS on ncacn_np"
testit "$name" bin/smbtorture ncacn_np:"$server" $OPTIONS RPC-SPOOLSS "$*" || failed=`expr $failed + 1` testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server" $OPTIONS RPC-SPOOLSS "$*" || failed=`expr $failed + 1`
for bindoptions in padcheck connect sign seal spnego,sign spnego,seal validate bigendian; do for bindoptions in padcheck connect sign seal spnego,sign spnego,seal validate bigendian; do
for transport in ncacn_ip_tcp ncacn_np; do for transport in ncacn_ip_tcp ncacn_np; do
@ -43,14 +43,14 @@ for bindoptions in padcheck connect sign seal spnego,sign spnego,seal validate b
esac esac
for t in $tests; do for t in $tests; do
name="$t on $transport with $bindoptions" name="$t on $transport with $bindoptions"
testit "$name" bin/smbtorture $transport:"$server[$bindoptions]" $OPTIONS $t "$*" || failed=`expr $failed + 1` testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $OPTIONS $t "$*" || failed=`expr $failed + 1`
done done
done done
done done
name="RPC-DRSUAPI on ncacn_ip_tcp with seal" name="RPC-DRSUAPI on ncacn_ip_tcp with seal"
testit "$name" bin/smbtorture ncacn_ip_tcp:"$server[seal]" $OPTIONS RPC-DRSUAPI "$*" || failed=`expr $failed + 1` testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_ip_tcp:"$server[seal]" $OPTIONS RPC-DRSUAPI "$*" || failed=`expr $failed + 1`
name="RPC-DRSUAPI on ncacn_ip_tcp with seal,bigendian" name="RPC-DRSUAPI on ncacn_ip_tcp with seal,bigendian"
testit "$name" bin/smbtorture ncacn_ip_tcp:"$server[seal,bigendian]" $OPTIONS RPC-DRSUAPI "$*" || failed=`expr $failed + 1` testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_ip_tcp:"$server[seal,bigendian]" $OPTIONS RPC-DRSUAPI "$*" || failed=`expr $failed + 1`
testok $0 $failed testok $0 $failed