@matheusbsbs / matheus-bagliano / commits / 7596fe952d

tests: add LIBCURL prerequisite to tests needing libcurl

Add and use a LIBCURL prerequisite for tests added in 6dcbdc0d661 (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 e9184b0789a (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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Jun 15, 2022 at 12:36 UTC 7596fe952d92f06375b1ef9fcde1b03c97d23983

4 files changed +6 -5

t/lib-httpd.sh

+1 -1

@@ -29,7 +29,7 @@

30 #

32 -if test -n "$NO_CURL"

32 +if ! test_have_prereq LIBCURL

33 then

34 skip_all='skipping test, git built without http support'

35 test_done

t/t5516-fetch-push.sh

+2 -2

@@ -1834,7 +1834,7 @@ test_expect_success 'refuse to push a hidden ref, and make sure do not pollute t

1834 test_dir_is_empty testrepo/.git/objects/pack

1835 '

1836

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' '

1838 message="URL '\''https://username:<redacted>@localhost/'\'' uses plaintext credentials" &&

1839 test_must_fail git -c fetch.credentialsInUrl=allow fetch https://username:password@localhost 2>err &&

1840 ! grep "$message" err &&

@@ -1853,7 +1853,7 @@ test_expect_success 'fetch warns or fails when using username:password' '

1853 '

1854

1855

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' '

1857 message="URL '\''https://username:<redacted>@localhost/'\'' uses plaintext credentials" &&

1858 test_must_fail git -c fetch.credentialsInUrl=allow push https://username:password@localhost 2>err &&

1859 ! grep "$message" err &&

t/t5601-clone.sh

+2 -2

@@ -71,7 +71,7 @@ test_expect_success 'clone respects GIT_WORK_TREE' '

72 '

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' '

75 message="URL '\''https://username:<redacted>@localhost/'\'' uses plaintext credentials" &&

76 test_must_fail git -c fetch.credentialsInUrl=allow clone https://username:password@localhost attempt1 2>err &&

77 ! grep "$message" err &&

@@ -89,7 +89,7 @@ test_expect_success 'clone warns or fails when using username:password' '

89 test_line_count = 1 warnings

90 '

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/' '

93 test_must_fail git -c fetch.credentialsInUrl=warn clone https://username@localhost:8080 attempt3 2>err &&

94 ! grep "uses plaintext credentials" err

95 '

t/test-lib.sh

@@ -1572,6 +1572,7 @@ esac

1572 test_set_prereq REFFILES

1573

1574 ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1

1575 +test -z "$NO_CURL" && test_set_prereq LIBCURL

1576 test -z "$NO_PERL" && test_set_prereq PERL

1577 test -z "$NO_PTHREADS" && test_set_prereq PTHREADS

1578 test -z "$NO_PYTHON" && test_set_prereq PYTHON