From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Mar 2015 18:28:10 +0000 (-0700)
Subject: Merge branch 'jk/test-annoyances'
X-Git-Tag: v2.4.0-rc0~24
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/07da4e092f4ce90271f8545b1b50c1a272dfaefb?ds=sidebyside;hp=-c

Merge branch 'jk/test-annoyances'

Test fixes.

* jk/test-annoyances:
t5551: make EXPENSIVE test cheaper
t5541: move run_with_cmdline_limit to test-lib.sh
t: pass GIT_TRACE through Apache
t: redirect stderr GIT_TRACE to descriptor 4
t: translate SIGINT to an exit
---

07da4e092f4ce90271f8545b1b50c1a272dfaefb
diff --combined t/t5551-http-fetch-smart.sh
index b97077351d,7f6eb9f3db..df47851752
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@@ -213,21 -213,10 +213,21 @@@ test_expect_success 'cookies stored in 
  	test_cmp expect_cookies.txt cookies_tail.txt
  '
  
 +test_expect_success 'transfer.hiderefs works over smart-http' '
 +	test_commit hidden &&
 +	test_commit visible &&
 +	git push public HEAD^:refs/heads/a HEAD:refs/heads/b &&
 +	git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \
 +		config transfer.hiderefs refs/heads/a &&
 +	git clone --bare "$HTTPD_URL/smart/repo.git" hidden.git &&
 +	test_must_fail git -C hidden.git rev-parse --verify a &&
 +	git -C hidden.git rev-parse --verify b
 +'
 +
- test_expect_success EXPENSIVE 'create 50,000 tags in the repo' '
+ test_expect_success 'create 2,000 tags in the repo' '
  	(
  	cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
- 	for i in `test_seq 50000`
+ 	for i in $(test_seq 2000)
  	do
  		echo "commit refs/heads/too-many-refs"
  		echo "mark :$i"
@@@ -248,13 -237,22 +248,22 @@@
  	)
  '
  
- test_expect_success EXPENSIVE 'clone the 50,000 tag repo to check OS command line overflow' '
- 	git clone $HTTPD_URL/smart/repo.git too-many-refs &&
+ test_expect_success CMDLINE_LIMIT \
+ 	'clone the 2,000 tag repo to check OS command line overflow' '
+ 	run_with_limited_cmdline git clone $HTTPD_URL/smart/repo.git too-many-refs &&
  	(
  		cd too-many-refs &&
- 		test $(git for-each-ref refs/tags | wc -l) = 50000
+ 		git for-each-ref refs/tags >actual &&
+ 		test_line_count = 2000 actual
  	)
  '
  
+ test_expect_success 'large fetch-pack requests can be split across POSTs' '
+ 	GIT_CURL_VERBOSE=1 git -c http.postbuffer=65536 \
+ 		clone --bare "$HTTPD_URL/smart/repo.git" split.git 2>err &&
+ 	grep "^> POST" err >posts &&
+ 	test_line_count = 2 posts
+ '
+ 
  stop_httpd
  test_done