Web lists-archives.com

Re: [PATCH 2/2] t/lib-git-svn.sh: improve svnserve tests with parallel make test




Hi,

Todd Zullinger wrote:

> Previously, setting SVNSERVE_PORT enabled several tests which require a
> local svnserve daemon to be run (in t9113 & t9126).  The tests share the
> setup of the local svnserve via `start_svnserve()`.  The function uses
> the svnserve option `--listen-once` which causes svnserve to accept one
> connection on the port, serve it, and exit.  When running the tests in
> parallel this fails if one test tries to start svnserve while the other
> is still running.

I had trouble reading this because I didn't know what previous time it
was referring to.  Is it about how the option currently behaves?

(Git's commit messages tend to use the present tense to describe the
behavior before the patch, like a bug report, and the imperative to
describe the change the patch proposes to make, like an impolite bug
report. :))

> Use the test number as the svnserve port (similar to httpd tests) to
> avoid port conflicts.  Set GIT_TEST_SVNSERVE to any value other than
> 'false' or 'auto' to enable these tests.

This uses imperative in two ways and also ended up confusing me.  The
second one is a direction to me, not Git, right?  How about:

	Use the test number instead of $SVNSERVE_PORT as the svnserve
	port (similar to httpd tests) to avoid port conflicts.
	Developers can set GIT_TEST_SVNSERVE to any value other than
	'false' or 'auto' to enable these tests.
>
> Signed-off-by: Todd Zullinger <tmz@xxxxxxxxx>
> ---
>  t/lib-git-svn.sh | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

The patch looks good.  Thanks.

> diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
> index 84366b2624..4c1f81f167 100644
> --- a/t/lib-git-svn.sh
> +++ b/t/lib-git-svn.sh
> @@ -110,14 +110,16 @@ EOF
>  }
>  
>  require_svnserve () {
> -	if test -z "$SVNSERVE_PORT"
> +	test_tristate GIT_TEST_SVNSERVE
> +	if ! test "$GIT_TEST_SVNSERVE" = true
>  	then
> -		skip_all='skipping svnserve test. (set $SVNSERVE_PORT to enable)'
> +		skip_all='skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)'
>  		test_done
>  	fi
>  }
>  
>  start_svnserve () {
> +	SVNSERVE_PORT=${SVNSERVE_PORT-${this_test#t}}
>  	svnserve --listen-port $SVNSERVE_PORT \
>  		 --root "$rawsvnrepo" \
>  		 --listen-once \
> -- 
> 2.15.1
>