Skip to content

Commit

Permalink
Auto merge of #14124 - eth3lbert:redact-entity-not-found, r=epage
Browse files Browse the repository at this point in the history
test: Add auto-redaction for not found error

### What does this PR try to resolve?

This PR introduces auto-redaction for error messages related to "entity not found" across various platforms, as discussed in #14111 (comment).
  • Loading branch information
bors committed Jun 21, 2024
2 parents e35cd55 + 91569f8 commit 5e93754
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
12 changes: 12 additions & 0 deletions crates/cargo-test-support/src/compare.rs
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,18 @@ static MIN_LITERAL_REDACTIONS: &[(&str, &str)] = &[
("[EXE]", std::env::consts::EXE_SUFFIX),
("[BROKEN_PIPE]", "Broken pipe (os error 32)"),
("[BROKEN_PIPE]", "The pipe is being closed. (os error 232)"),
// Unix message for an entity was not found
("[NOT_FOUND]", "No such file or directory (os error 2)"),
// Windows message for an entity was not found
(
"[NOT_FOUND]",
"The system cannot find the file specified. (os error 2)",
),
(
"[NOT_FOUND]",
"The system cannot find the path specified. (os error 3)",
),
("[NOT_FOUND]", "program not found"),
// Unix message for exit status
("[EXIT_STATUS]", "exit status"),
// Windows message for exit status
Expand Down
8 changes: 3 additions & 5 deletions tests/testsuite/config_include.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! Tests for `include` config field.
use super::config::{assert_error, write_config_at, write_config_toml, GlobalContextBuilder};
use cargo_test_support::project;
use cargo_test_support::str;
use cargo_test_support::{no_such_file_err_msg, project};

#[cargo_test]
fn gated() {
Expand Down Expand Up @@ -162,8 +162,7 @@ Caused by:
failed to read configuration file `[..]/.cargo/missing.toml`
Caused by:
{}",
no_such_file_err_msg()
[NOT_FOUND]",
),
);
}
Expand Down Expand Up @@ -270,8 +269,7 @@ Caused by:
failed to read configuration file `[..]/foobar.toml`
Caused by:
{}",
no_such_file_err_msg()
[NOT_FOUND]"
),
);
}
Expand Down

0 comments on commit 5e93754

Please sign in to comment.