Skip to content

Commit 34485e9

Browse files
committed
Revert "Disable flaky tests for now (#11821)"
upgrade `gix` to v0.41 to fix flaky auth tests and revert commit c890c64. The latest release (https://github.com/Byron/gitoxide/releases/tag/gix-v0.41.0) makes writing to the credential helper non-fallible which is useful if the helper program doesn't read from stdin and is in line with of `git` implements it as well. This fix also undoes a pin `tempfile` to version 3.3 which at this time causes build issues for some platforms if `tempfile` version 3.4 or newer would be used. Thus this PR cannot be merged until `tempfile` will not cause build failures. This also means that `cargo` can't upgrade to any newer version of `gitoxide` until `tempfile` isn't an issue anymore, also blocking the shallow clone feature for example. @weihanglo, maybe you can replace this line with references to issues to wait for.
1 parent 8e11d86 commit 34485e9

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ filetime = "0.2.9"
3030
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
3131
git2 = "0.17.0"
3232
git2-curl = "0.18.0"
33-
gix = { version = "0.39.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
33+
gix = { version = "0.41.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
3434
gix-features-for-configuration-only = { version = "0.28.0", package = "gix-features", features = [ "parallel" ] }
3535
glob = "0.3.0"
3636
hex = "0.4"

tests/testsuite/git_auth.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,6 @@ fn setup_failed_auth_test() -> (SocketAddr, JoinHandle<()>, Arc<AtomicUsize>) {
105105
// Tests that HTTP auth is offered from `credential.helper`.
106106
#[cargo_test]
107107
fn http_auth_offered() {
108-
// TODO(Seb): remove this once possible.
109-
if cargo_uses_gitoxide() {
110-
// Without the fixes in https://github.com/Byron/gitoxide/releases/tag/gix-v0.41.0 this test is flaky.
111-
return;
112-
}
113108
let (addr, t, connections) = setup_failed_auth_test();
114109
let p = project()
115110
.file(
@@ -372,11 +367,6 @@ Caused by:
372367

373368
#[cargo_test]
374369
fn instead_of_url_printed() {
375-
// TODO(Seb): remove this once possible.
376-
if cargo_uses_gitoxide() {
377-
// Without the fixes in https://github.com/Byron/gitoxide/releases/tag/gix-v0.41.0 this test is flaky.
378-
return;
379-
}
380370
let (addr, t, _connections) = setup_failed_auth_test();
381371
let config = paths::home().join(".gitconfig");
382372
let mut config = git2::Config::open(&config).unwrap();

0 commit comments

Comments
 (0)