Merge branch 'jk/test-annoyances'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2015 18:28:10 +0000 (11:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2015 18:28:10 +0000 (11:28 -0700)
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

1  2 
t/t5551-http-fetch-smart.sh
index b97077351ddd8f4dd29ddb1931754b0b83f4d808,7f6eb9f3db853d33bd1cfaba06348842f0ea3925..df47851752f6b9b085d0feab8d6ba24ef2d0da29
@@@ -213,21 -213,10 +213,21 @@@ test_expect_success 'cookies stored in 
        test_cmp expect_cookies.txt cookies_tail.txt
  '
  
- test_expect_success EXPENSIVE 'create 50,000 tags in the repo' '
 +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 '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"
        )
  '
  
- 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