development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-08-25 10:35:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

re-enable flaky tests thanks to update to gix-config. (#11821)

Browse source 
With `gix-config` now being fixed, it will properly respect `GIT_CONFIG_NOSYSTEM`
both for system-wide configuration as well as for the git installation configuration.

That way, credential helpers provided by the git installation won't be called anymore,
which prevents them from 'somehow' emitting information to stderr.

The latter was previously disabled for credential helpers, and despite
everything^1 looking like it should work, it simply didn't.

[1]: https://github.com/rust-lang/cargo/pull/13117#issuecomment-1844881287
This commit is contained in:
Sebastian Thiel 2023-12-07 10:15:58 +01:00
parent 64266c842b
commit 189de40a6f
No known key found for this signature in database
GPG key ID: 9CB5EE7895E8268B
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -1173,9 +1173,9 @@ dependencies = [
[[package]]
name = "gix-config"
version = "0.32.0"
version = "0.32.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ada0e0b904b17a3f2636b70a33e2c8b075b8eb947db80f6c6e94549f2d5b78d1"
checksum = "0341471d55d8676e98b88e121d7065dfa4c9c5acea4b6d6ecdd2846e85cce0c3"
dependencies = [
"bstr",
"gix-config-value",

12
tests/testsuite/git_auth.rs
View file

@ -105,11 +105,6 @@ fn setup_failed_auth_test() -> (SocketAddr, JoinHandle<()>, Arc<AtomicUsize>) {
// Tests that HTTP auth is offered from `credential.helper`.
#[cargo_test]
fn http_auth_offered() {
// TODO: remove this once possible.
// See https://github.com/rust-lang/cargo/issues/11821
if cargo_uses_gitoxide() {
return;
}
let (addr, t, connections) = setup_failed_auth_test();
let p = project()
.file(
@ -139,7 +134,6 @@ fn http_auth_offered() {
// This is a "contains" check because the last error differs by platform,
// may span multiple lines, and isn't relevant to this test.
p.cargo("check")
.env("GIX_CREDENTIALS_HELPER_STDERR", "0")
.with_status(101)
.with_stderr_contains(&format!(
"\
@ -373,11 +367,6 @@ Caused by:
#[cargo_test]
fn instead_of_url_printed() {
// TODO: remove this once possible.
// See https://github.com/rust-lang/cargo/issues/11821
if cargo_uses_gitoxide() {
return;
}
let (addr, t, _connections) = setup_failed_auth_test();
let config = paths::home().join(".gitconfig");
let mut config = git2::Config::open(&config).unwrap();
@ -404,7 +393,6 @@ fn instead_of_url_printed() {
.build();
p.cargo("check")
.env("GIX_CREDENTIALS_HELPER_STDERR", "0")
.with_status(101)
.with_stderr(&format!(
"\