sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

ctdb-tests: Add timeout for individual tests, default is 10 minutes

Browse Source 
This will cause a hung test to time out and fail rather than letting a
test run hang indefinitely.  Some tests can take 5 minutes to run, so
10 minutes should be plenty.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-01-20 17:05:37 +11:00 committed by Amitay Isaacs
parent 7ea5d38a69
commit da3aaf972a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ctdb/tests/run_tests.sh
View File

@ -46,8 +46,9 @@ export TEST_LOCAL_DAEMONS
[ -n "$TEST_LOCAL_DAEMONS" ] || TEST_LOCAL_DAEMONS=3
export TEST_VAR_DIR=""
export TEST_CLEANUP=false
export TEST_TIMEOUT=600
temp=$(getopt -n "$prog" -o "AcCdDehHNqSvV:xX" -l help -- "$@")
temp=$(getopt -n "$prog" -o "AcCdDehHNqST:vV:xX" -l help -- "$@")
[ $? != 0 ] && usage
@ -65,6 +66,7 @@ while true ; do
-N) with_summary=false ; shift ;;
-q) quiet=true ; shift ;;
-S) socket_wrapper=true ; shift ;;
-T) TEST_TIMEOUT="$2" ; shift 2 ;;
-v) TEST_VERBOSE=true ; shift ;;
-V) TEST_VAR_DIR="$2" ; shift 2 ;;
-x) set -x; shift ;;
@ -114,6 +116,9 @@ ctdb_test_end ()
interp="PASSED"
statstr=""
echo "ALL OK: $*"
elif [ $status -eq 124 ] ; then
interp="TIMEOUT"
statstr=" (status $status)"
else
interp="FAILED"
statstr=" (status $status)"
@ -137,7 +142,7 @@ ctdb_test_run ()
$no_header || ctdb_test_begin "$name"
local status=0
"$@" || status=$?
timeout $TEST_TIMEOUT "$@" || status=$?
$no_header || ctdb_test_end "$name" "$status" "$*"