Re: [PATCH v5 4/6] git-p4: add p4d timeout in tests
From: Luke Diamand <hidden>
Date: 2016-06-15 23:07:15
On 15/11/15 13:08, larsxschneider@gmail.com wrote:
From: Lars Schneider <redacted> In rare cases p4d seems to hang. This watchdog will kill the p4d process after 300s in any case. That means each individual git p4 test needs to finish before 300s or it will fail.
Looks good to me.
quoted hunk ↗ jump to hunk
Signed-off-by: Lars Schneider <redacted> --- t/lib-git-p4.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index 8d6b48f..f2a009c 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh@@ -10,6 +10,10 @@ TEST_NO_CREATE_REPO=NoThanks # here the maximal retry timeout in seconds. RETRY_TIMEOUT=60 +# Sometimes p4d seems to hang. Terminate the p4d process automatically after +# the defined timeout in seconds. +P4D_TIMEOUT=300 + . ./test-lib.sh if ! test_have_prereq PYTHON@@ -85,6 +89,19 @@ start_p4d() { # will be caught with the "kill -0" check below. i=${P4D_START_PATIENCE:-300} pid=$(cat "$pidfile") + + timeout=$(($(date +%s) + $P4D_TIMEOUT)) + while true + do + if test $(date +%s) -gt $timeout + then + kill -9 $pid + exit 1 + fi + sleep 1 + done & + watchdog_pid=$! + ready= while test $i -gt 0 do@@ -145,7 +162,8 @@ kill_p4d() { retry_until_fail kill -9 $pid # complain if it would not die test_must_fail kill $pid >/dev/null 2>&1 && - rm -rf "$db" "$cli" "$pidfile" + rm -rf "$db" "$cli" "$pidfile" && + retry_until_fail kill -9 $watchdog_pid } cleanup_git() {