On Mon, Oct 15, 2018 at 03:12:11AM -0700, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin <johannes.schindelin@xxxxxx>
>
> This should be more reliable than the current method, and prepares the
> test suite for a consistent way to clean up before re-running the tests
> with different options.
This patch makes the test suite hang in all four Travis CI build jobs
with P4 installed without any of the P4 tests finishing.
Reverting this patch from the whole patch series makes it work again.
I've also tried to revert only this first hunk of the patch below,
because based on the comment I thought it's worth a try, but it didn't
really help. It did make a difference: the 300s watchdog timer
eventually kicked in, and then the test scripts could finish
successfully... but there are a lot of P4 test scripts, and with each
taking 300s the build job still timeouted.
All this may (or may not) be related to and be a different symptom of
the leftover p4d processes Luke mentioned. I couldn't reproduce any
of this on my machine so far.
> diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
> index c27599474c..f4f5d7d296 100644
> --- a/t/lib-git-p4.sh
> +++ b/t/lib-git-p4.sh
> @@ -74,15 +74,6 @@ cli="$TRASH_DIRECTORY/cli"
> git="$TRASH_DIRECTORY/git"
> pidfile="$TRASH_DIRECTORY/p4d.pid"
>
> -# Sometimes "prove" seems to hang on exit because p4d is still running
> -cleanup () {
> - if test -f "$pidfile"
> - then
> - kill -9 $(cat "$pidfile") 2>/dev/null && exit 255
> - fi
> -}
> -trap cleanup EXIT
> -
> # git p4 submit generates a temp file, which will
> # not get cleaned up if the submission fails. Don't
> # clutter up /tmp on the test machine.
