Skip to content

Commit 930b67e

Browse files
committed
Merge branch 'ep/use-git-trace-curl-in-tests'
Update a few tests that used to use GIT_CURL_VERBOSE to use the newer GIT_TRACE_CURL. * ep/use-git-trace-curl-in-tests: t5551-http-fetch-smart.sh: use the GIT_TRACE_CURL environment var t5550-http-fetch-dumb.sh: use the GIT_TRACE_CURL environment var test-lib.sh: preserve GIT_TRACE_CURL from the environment t5541-http-push-smart.sh: use the GIT_TRACE_CURL environment var
2 parents b273595 + 14e2411 commit 930b67e

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

t/t5541-http-push-smart.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ test_expect_success 'push to remote repository (standard)' '
7474
test_tick &&
7575
git commit -m path2 &&
7676
HEAD=$(git rev-parse --verify HEAD) &&
77-
GIT_CURL_VERBOSE=1 git push -v -v 2>err &&
77+
GIT_TRACE_CURL=true git push -v -v 2>err &&
7878
! grep "Expect: 100-continue" err &&
7979
grep "POST git-receive-pack ([0-9]* bytes)" err &&
8080
(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&

t/t5550-http-fetch-dumb.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,15 +263,15 @@ check_language () {
263263
>expect
264264
;;
265265
?*)
266-
echo "Accept-Language: $1" >expect
266+
echo "=> Send header: Accept-Language: $1" >expect
267267
;;
268268
esac &&
269-
GIT_CURL_VERBOSE=1 \
269+
GIT_TRACE_CURL=true \
270270
LANGUAGE=$2 \
271271
git ls-remote "$HTTPD_URL/dumb/repo.git" >output 2>&1 &&
272272
tr -d '\015' <output |
273273
sort -u |
274-
sed -ne '/^Accept-Language:/ p' >actual &&
274+
sed -ne '/^=> Send header: Accept-Language:/ p' >actual &&
275275
test_cmp expect actual
276276
}
277277

@@ -295,8 +295,8 @@ ja;q=0.95, zh;q=0.94, sv;q=0.93, pt;q=0.92, nb;q=0.91, *;q=0.90" \
295295
'
296296

297297
test_expect_success 'git client does not send an empty Accept-Language' '
298-
GIT_CURL_VERBOSE=1 LANGUAGE= git ls-remote "$HTTPD_URL/dumb/repo.git" 2>stderr &&
299-
! grep "^Accept-Language:" stderr
298+
GIT_TRACE_CURL=true LANGUAGE= git ls-remote "$HTTPD_URL/dumb/repo.git" 2>stderr &&
299+
! grep "^=> Send header: Accept-Language:" stderr
300300
'
301301

302302
stop_httpd

t/t5551-http-fetch-smart.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,21 @@ cat >exp <<EOF
4343
< Content-Type: application/x-git-upload-pack-result
4444
EOF
4545
test_expect_success 'clone http repository' '
46-
GIT_CURL_VERBOSE=1 git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err &&
46+
GIT_TRACE_CURL=true git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err &&
4747
test_cmp file clone/file &&
4848
tr '\''\015'\'' Q <err |
4949
sed -e "
5050
s/Q\$//
5151
/^[*] /d
52+
/^== Info:/d
53+
/^=> Send header, /d
54+
/^=> Send header:$/d
55+
/^<= Recv header, /d
56+
/^<= Recv header:$/d
57+
s/=> Send header: //
58+
s/= Recv header://
59+
/^<= Recv data/d
60+
/^=> Send data/d
5261
/^$/d
5362
/^< $/d
5463
@@ -261,9 +270,9 @@ test_expect_success CMDLINE_LIMIT \
261270
'
262271

263272
test_expect_success 'large fetch-pack requests can be split across POSTs' '
264-
GIT_CURL_VERBOSE=1 git -c http.postbuffer=65536 \
273+
GIT_TRACE_CURL=true git -c http.postbuffer=65536 \
265274
clone --bare "$HTTPD_URL/smart/repo.git" split.git 2>err &&
266-
grep "^> POST" err >posts &&
275+
grep "^=> Send header: POST" err >posts &&
267276
test_line_count = 2 posts
268277
'
269278

t/test-lib.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
8989
UNZIP
9090
PERF_
9191
CURL_VERBOSE
92+
TRACE_CURL
9293
));
9394
my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
9495
print join("\n", @vars);

0 commit comments

Comments
 (0)