Skip to content

Commit 7596fe9

Browse files
avargitster
authored andcommitted
tests: add LIBCURL prerequisite to tests needing libcurl
Add and use a LIBCURL prerequisite for tests added in 6dcbdc0 (remote: create fetch.credentialsInUrl config, 2022-06-06). These tests would get as far as emitting a couple of the warnings we were testing for, but would then die as we had no "git-remote-https" program compiled. It would be more consistent with other prerequisites (e.g. PERL for NO_PERL) to name this "CURL", but since e9184b0 (t5561: skip tests if curl is not available, 2018-04-03) we've had that prerequisite defined for checking of we have the curl(1) program. The existing "CURL" prerequisite is only used in one place, and we should probably name it "CURL_PROGRAM", then rename "LIBCURL" to "CURL" as a follow-up, but for now (pre-v2.37.0) let's aim for the most minimal fix possible. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1f8496c commit 7596fe9

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

t/lib-httpd.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# Copyright (c) 2008 Clemens Buchacher <[email protected]>
3030
#
3131

32-
if test -n "$NO_CURL"
32+
if ! test_have_prereq LIBCURL
3333
then
3434
skip_all='skipping test, git built without http support'
3535
test_done

t/t5516-fetch-push.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1834,7 +1834,7 @@ test_expect_success 'refuse to push a hidden ref, and make sure do not pollute t
18341834
test_dir_is_empty testrepo/.git/objects/pack
18351835
'
18361836

1837-
test_expect_success 'fetch warns or fails when using username:password' '
1837+
test_expect_success LIBCURL 'fetch warns or fails when using username:password' '
18381838
message="URL '\''https://username:<redacted>@localhost/'\'' uses plaintext credentials" &&
18391839
test_must_fail git -c fetch.credentialsInUrl=allow fetch https://username:password@localhost 2>err &&
18401840
! grep "$message" err &&
@@ -1853,7 +1853,7 @@ test_expect_success 'fetch warns or fails when using username:password' '
18531853
'
18541854

18551855

1856-
test_expect_success 'push warns or fails when using username:password' '
1856+
test_expect_success LIBCURL 'push warns or fails when using username:password' '
18571857
message="URL '\''https://username:<redacted>@localhost/'\'' uses plaintext credentials" &&
18581858
test_must_fail git -c fetch.credentialsInUrl=allow push https://username:password@localhost 2>err &&
18591859
! grep "$message" err &&

t/t5601-clone.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ test_expect_success 'clone respects GIT_WORK_TREE' '
7171
7272
'
7373

74-
test_expect_success 'clone warns or fails when using username:password' '
74+
test_expect_success LIBCURL 'clone warns or fails when using username:password' '
7575
message="URL '\''https://username:<redacted>@localhost/'\'' uses plaintext credentials" &&
7676
test_must_fail git -c fetch.credentialsInUrl=allow clone https://username:password@localhost attempt1 2>err &&
7777
! grep "$message" err &&
@@ -89,7 +89,7 @@ test_expect_success 'clone warns or fails when using username:password' '
8989
test_line_count = 1 warnings
9090
'
9191

92-
test_expect_success 'clone does not detect username:password when it is https://username@domain:port/' '
92+
test_expect_success LIBCURL 'clone does not detect username:password when it is https://username@domain:port/' '
9393
test_must_fail git -c fetch.credentialsInUrl=warn clone https://username@localhost:8080 attempt3 2>err &&
9494
! grep "uses plaintext credentials" err
9595
'

t/test-lib.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1572,6 +1572,7 @@ esac
15721572
test_set_prereq REFFILES
15731573

15741574
( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
1575+
test -z "$NO_CURL" && test_set_prereq LIBCURL
15751576
test -z "$NO_PERL" && test_set_prereq PERL
15761577
test -z "$NO_PTHREADS" && test_set_prereq PTHREADS
15771578
test -z "$NO_PYTHON" && test_set_prereq PYTHON

0 commit comments

Comments
 (0)