mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
t5516/t5601: be less strict about the number of credential warnings
It is unclear as to _why_, but under certain circumstances the warning about credentials being passed as part of the URL seems to be swallowed by the `git remote-https` helper in the Windows jobs of Git's CI builds. Since it is not actually important how many times Git prints the warning/error message, as long as it prints it at least once, let's just make the test a bit more lenient and test for the latter instead of the former, which works around these CI issues. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Taylor Blau <me@ttaylorr.com>
This commit is contained in:
parent
762521e8a5
commit
db8016b43f
|
@ -597,17 +597,17 @@ test_expect_success 'clone warns or fails when using username:password' '
|
||||||
git -c transfer.credentialsInUrl=warn \
|
git -c transfer.credentialsInUrl=warn \
|
||||||
clone $url_userpass attempt2 2>err &&
|
clone $url_userpass attempt2 2>err &&
|
||||||
grep "warning: $message" err >warnings &&
|
grep "warning: $message" err >warnings &&
|
||||||
test_line_count = 2 warnings &&
|
test_line_count -ge 1 warnings &&
|
||||||
|
|
||||||
test_must_fail git -c transfer.credentialsInUrl=die \
|
test_must_fail git -c transfer.credentialsInUrl=die \
|
||||||
clone $url_userpass attempt3 2>err &&
|
clone $url_userpass attempt3 2>err &&
|
||||||
grep "fatal: $message" err >warnings &&
|
grep "fatal: $message" err >warnings &&
|
||||||
test_line_count = 1 warnings &&
|
test_line_count -ge 1 warnings &&
|
||||||
|
|
||||||
test_must_fail git -c transfer.credentialsInUrl=die \
|
test_must_fail git -c transfer.credentialsInUrl=die \
|
||||||
clone $url_userblank attempt4 2>err &&
|
clone $url_userblank attempt4 2>err &&
|
||||||
grep "fatal: $message" err >warnings &&
|
grep "fatal: $message" err >warnings &&
|
||||||
test_line_count = 1 warnings
|
test_line_count -ge 1 warnings
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'clone does not detect username:password when it is https://username@domain:port/' '
|
test_expect_success 'clone does not detect username:password when it is https://username@domain:port/' '
|
||||||
|
@ -630,17 +630,17 @@ test_expect_success 'fetch warns or fails when using username:password' '
|
||||||
|
|
||||||
git -c transfer.credentialsInUrl=warn fetch $url_userpass 2>err &&
|
git -c transfer.credentialsInUrl=warn fetch $url_userpass 2>err &&
|
||||||
grep "warning: $message" err >warnings &&
|
grep "warning: $message" err >warnings &&
|
||||||
test_line_count = 3 warnings &&
|
test_line_count -ge 1 warnings &&
|
||||||
|
|
||||||
test_must_fail git -c transfer.credentialsInUrl=die \
|
test_must_fail git -c transfer.credentialsInUrl=die \
|
||||||
fetch $url_userpass 2>err &&
|
fetch $url_userpass 2>err &&
|
||||||
grep "fatal: $message" err >warnings &&
|
grep "fatal: $message" err >warnings &&
|
||||||
test_line_count = 1 warnings &&
|
test_line_count -ge 1 warnings &&
|
||||||
|
|
||||||
test_must_fail git -c transfer.credentialsInUrl=die \
|
test_must_fail git -c transfer.credentialsInUrl=die \
|
||||||
fetch $url_userblank 2>err &&
|
fetch $url_userblank 2>err &&
|
||||||
grep "fatal: $message" err >warnings &&
|
grep "fatal: $message" err >warnings &&
|
||||||
test_line_count = 1 warnings
|
test_line_count -ge 1 warnings
|
||||||
'
|
'
|
||||||
|
|
||||||
|
|
||||||
|
@ -654,7 +654,7 @@ test_expect_success 'push warns or fails when using username:password' '
|
||||||
test_must_fail git -c transfer.credentialsInUrl=die \
|
test_must_fail git -c transfer.credentialsInUrl=die \
|
||||||
push $url_userpass 2>err &&
|
push $url_userpass 2>err &&
|
||||||
grep "fatal: $message" err >warnings &&
|
grep "fatal: $message" err >warnings &&
|
||||||
test_line_count = 1 warnings
|
test_line_count -ge 1 warnings
|
||||||
'
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue