Auto merge of #13130 - Byron:fix-flaky-tests, r=weihanglo

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

Related to #11821.

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 looking like it should work][1], it simply didn't.

[1]: #13117 (comment)

Author: bors

Cargo.lock

@@ -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!(
             "\