Re: [PATCH v5 1/4] t5541-http-push: add test for chunked

[Junio C Hamano <gitster@pobox.com>]

Tay Ray Chuan <rctay89@gmail.com> writes:

> +	GIT_CURL_VERBOSE=1 git push -v -v 2>err &&
> +	! grep "Expect: 100-continue" err &&
> +	grep "POST git-receive-pack (376 bytes)" err &&

This "376 bytes" bothers me. Can our packing algorithm never improve?

>  	(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
>  	 test $HEAD = $(git rev-parse --verify HEAD))
>  '
> @@ -140,5 +142,17 @@ test_expect_success C_LOCALE_OUTPUT 'push fails for non-fast-forward refs unmatc
>  		output
>  '
>  
> +test_expect_success 'push (chunked)' '
> +	git checkout master &&
> +	test_commit commit path3 &&
> +	HEAD=$(git rev-parse --verify HEAD) &&
> +	git config http.postbuffer 4 &&
> +	test_when_finished git config --unset http.postbuffer &&

It probably is a good style to send the command line as a single
argument.  There are a few violations in the existing code but that is not
an excuse to add more violations.

> +	git push -v -v origin $BRANCH 2>err &&
> +	grep "POST git-receive-pack (chunked)" err &&
> +	(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
> +	 test $HEAD = $(git rev-parse --verify HEAD))
> +'
> +
>  stop_httpd
>  test_done

I'll queue this with the following trivial fix-up.

By the way, the "(chunked) test" is failing for me, with

  Pushing to http://127.0.0.1:5541/smart/test_repo.git
  POST git-receive-pack (chunked)
  POST git-receive-pack (chunked)
  POST git-receive-pack (chunked)
  fatal: The remote end hung up unexpectedly
  fatal: The remote end hung up unexpectedly

in trash/test_repo_clone/err; sometimes with two POSTs and sometimes with
three POSTs before we get the "fatal:".

---

 t/t5541-http-push.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index fec552c..4b93fa1 100755
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -74,7 +74,7 @@ test_expect_success 'push to remote repository (standard)' '
 	HEAD=$(git rev-parse --verify HEAD) &&
 	GIT_CURL_VERBOSE=1 git push -v -v 2>err &&
 	! grep "Expect: 100-continue" err &&
-	grep "POST git-receive-pack (376 bytes)" err &&
+	grep "POST git-receive-pack ([0-9]* bytes)" err &&
 	(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
 	 test $HEAD = $(git rev-parse --verify HEAD))
 '
@@ -147,7 +147,7 @@ test_expect_success 'push (chunked)' '
 	test_commit commit path3 &&
 	HEAD=$(git rev-parse --verify HEAD) &&
 	git config http.postbuffer 4 &&
-	test_when_finished git config --unset http.postbuffer &&
+	test_when_finished "git config --unset http.postbuffer" &&
 	git push -v -v origin $BRANCH 2>err &&
 	grep "POST git-receive-pack (chunked)" err &&
 	(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&