Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: relax redactions for rust-lang/rust #14203

Merged
merged 2 commits into from
Jul 7, 2024
Merged

test: relax redactions for rust-lang/rust #14203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b27914
test: relax redaction for sysroot
weihanglo Jul 6, 2024
e491c06
test: relax redaction for running `ssh`
weihanglo Jul 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/testsuite/cfg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ lib___.rlib
[..]___.[..]
[..]___.[..]
[..]___.[..]
[..]rust[..]
[..]


"#]])
Expand All @@ -470,7 +470,7 @@ lib___.rlib
[..]___.[..]
[..]___.[..]
[..]___.[..]
[..]rust[..]
[..]
[..],[..]
___
123
Expand Down
27 changes: 3 additions & 24 deletions tests/testsuite/git_auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ use std::sync::atomic::{AtomicUsize, Ordering::SeqCst};
use std::sync::Arc;
use std::thread::{self, JoinHandle};

use cargo_test_support::basic_manifest;
use cargo_test_support::git::cargo_uses_gitoxide;
use cargo_test_support::paths;
use cargo_test_support::{basic_manifest, project, str};
use cargo_test_support::project;

fn setup_failed_auth_test() -> (SocketAddr, JoinHandle<()>, Arc<AtomicUsize>) {
let server = TcpListener::bind("127.0.0.1:0").unwrap();
Expand Down Expand Up @@ -412,29 +413,7 @@ Caused by:

p.cargo("check -v")
.with_status(101)
.with_stderr_data(str![[r#"
[UPDATING] git repository `ssh://needs-proxy.invalid/git`
[RUNNING] `git fetch --verbose --force --update-head-ok [..]ssh://needs-proxy.invalid/git[..] [..]+HEAD:refs/remotes/origin/HEAD[..]`
ssh: Could not resolve hostname needs-proxy.invalid: [..] not known
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
[ERROR] failed to get `foo` as a dependency of package `foo v0.0.0 ([ROOT]/foo)`

Caused by:
failed to load source for dependency `foo`

Caused by:
Unable to update ssh://needs-proxy.invalid/git

Caused by:
failed to fetch into: [ROOT]/home/.cargo/git/db/git-[HASH]

Caused by:
process didn't exit successfully: `git fetch --verbose --force --update-head-ok [..]ssh://needs-proxy.invalid/git[..] [..]+HEAD:refs/remotes/origin/HEAD[..]` ([EXIT_STATUS]: 128)

"#]])
.with_stderr_contains("[..]Unable to update[..]")
.with_stderr_does_not_contain("[..]try enabling `git-fetch-with-cli`[..]")
.run();
}
Expand Down