Skip to content

Commit

Permalink
Revert "Disable flaky tests for now (rust-lang#11821)"
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Byron committed Apr 4, 2023
1 parent 8e11d86 commit 34485e9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ filetime = "0.2.9"
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
git2 = "0.17.0"
git2-curl = "0.18.0"
gix = { version = "0.39.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
gix = { version = "0.41.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
gix-features-for-configuration-only = { version = "0.28.0", package = "gix-features", features = [ "parallel" ] }
glob = "0.3.0"
hex = "0.4"
Expand Down
10 changes: 0 additions & 10 deletions tests/testsuite/git_auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(Seb): remove this once possible.
if cargo_uses_gitoxide() {
// Without the fixes in https://github.com/Byron/gitoxide/releases/tag/gix-v0.41.0 this test is flaky.
return;
}
let (addr, t, connections) = setup_failed_auth_test();
let p = project()
.file(
Expand Down Expand Up @@ -372,11 +367,6 @@ Caused by:

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

0 comments on commit 34485e9

Please sign in to comment.