Skip to content

Commit

Permalink
test: relax redaction for running ssh
Browse files Browse the repository at this point in the history
`ssh` binary is not available on some platforms.

https://github.com/rust-lang-ci/rust/actions/runs/9814397548/job/27101968836#step:25:10940

```
---- git_auth::net_err_suggests_fetch_with_cli stdout ----
running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo check -v`
running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo check -v`
thread 'git_auth::net_err_suggests_fetch_with_cli' panicked at tests/testsuite/git_auth.rs:439:10:

---- expected: tests/testsuite/git_auth.rs:415:27
++++ actual:   stderr
   1    1 | [UPDATING] git repository `ssh://needs-proxy.invalid/git`
   2    2 | [RUNNING] `git fetch --verbose --force --update-head-ok [..]ssh://needs-proxy.invalid/git[..] [..]+HEAD:refs/remotes/origin/HEAD[..]`
   3      - ssh: Could not resolve hostname needs-proxy.invalid: [..] not known
   4      - fatal: Could not read from remote repository.
   5      -
   6      - Please make sure you have the correct access rights
   7      - and the repository exists.
        3 + [ERROR] cannot run ssh: No such file or directory
        4 + fatal: unable to fork
   8    5 | [ERROR] failed to get `foo` as a dependency of package `foo v0.0.0 ([ROOT]/foo)`
   9    6 |
  10    7 | Caused by:
  11    8 |   failed to load source for dependency `foo`
  12    9 |
          ⋮
  15   12 |
  16   13 | Caused by:
  17   14 |   failed to fetch into: [ROOT]/home/.cargo/git/db/git-[HASH]
  18   15 |
  19   16 | Caused by:
  20      -   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)
       17 +   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)
```
  • Loading branch information
weihanglo committed Jul 7, 2024
1 parent 2b27914 commit bbe2542
Showing 1 changed file with 3 additions and 24 deletions.
27 changes: 3 additions & 24 deletions tests/testsuite/git_auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ use std::thread::{self, JoinHandle};

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;
use cargo_test_support::basic_manifest;

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

0 comments on commit bbe2542

Please sign in to comment.