From: Luke Diamand <luke@diamand•org>
To: larsxschneider@gmail•com, git@vger•kernel.org
Cc: sunshine@sunshineco•com, gitster@pobox•com
Subject: Re: [PATCH v5 4/6] git-p4: add p4d timeout in tests
Date: Mon, 16 Nov 2015 08:39:53 +0000 [thread overview]
Message-ID: <56499659.9070206@diamand.org> (raw)
In-Reply-To: <1447592920-89228-5-git-send-email-larsxschneider@gmail.com>
On 15/11/15 13:08, larsxschneider@gmail•com wrote:
> From: Lars Schneider <larsxschneider@gmail•com>
>
> 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.
>
> Signed-off-by: Lars Schneider <larsxschneider@gmail•com>
> ---
> 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() {
>
next prev parent reply other threads:[~2015-11-16 8:39 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-15 13:08 [PATCH v5 0/6] Add Travis CI support larsxschneider
2015-11-15 13:08 ` [PATCH v5 1/6] implement test_might_fail using a refactored test_must_fail larsxschneider
2015-11-15 13:08 ` [PATCH v5 2/6] add "ok=sigpipe" to test_must_fail and use it to fix flaky tests larsxschneider
2015-11-15 13:08 ` [PATCH v5 3/6] git-p4: retry kill/cleanup operations in tests with timeout larsxschneider
2015-11-16 8:36 ` Luke Diamand
2015-11-17 8:22 ` Lars Schneider
2015-11-17 9:38 ` Luke Diamand
2015-11-16 21:14 ` Eric Sunshine
2015-11-17 8:28 ` Lars Schneider
2015-11-17 8:35 ` Eric Sunshine
2015-11-17 9:34 ` Luke Diamand
2015-11-17 17:44 ` Eric Sunshine
2015-11-17 23:40 ` Luke Diamand
2015-11-15 13:08 ` [PATCH v5 4/6] git-p4: add p4d timeout in tests larsxschneider
2015-11-16 8:39 ` Luke Diamand [this message]
2015-11-15 13:08 ` [PATCH v5 5/6] git-p4: add trap to kill p4d on test exit larsxschneider
2015-11-16 8:43 ` Luke Diamand
2015-11-17 8:29 ` Lars Schneider
2015-11-15 13:08 ` [PATCH v5 6/6] Add Travis CI support larsxschneider
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56499659.9070206@diamand.org \
--to=luke@diamand$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=larsxschneider@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox