Add assert redactions #14054
Merged
Add assert redactions #14054
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-testing-cargo-itself
weihanglo
reviewed
Jun 12, 2024
| @@ -165,6 +165,11 @@ fn add_common_redactions(subs: &mut snapbox::Redactions) { | |||
| regex::Regex::new("home/\\.cargo/registry/src/-(?<redacted>[a-z0-9]+)").unwrap(), | |||
| ) | |||
| .unwrap(); | |||
| subs.insert( | |||
| "[HASH]", | |||
| regex::Regex::new(r"[a-z0-9\-_]+-(?<redacted>[0-9a-f]{16})").unwrap(), | |||
There was a problem hiding this comment.
This doesn't work with -C metadata=<hash>.
There was a problem hiding this comment.
Technically, this is trying to cover other cases so that would be another entry to cover that which wouldn't be a blocker for this PR but a nice to have
There was a problem hiding this comment.
Is there a way to forced regenerate existing snapshots, so we can add and remove redactions more freely, and won't bother forgetting to update some overly omitted snapshots?
There was a problem hiding this comment.
Not at this time. If we remove a redaction, it'll require an update anyways.
epage
reviewed
Jun 12, 2024
Muscraft
force-pushed
the
add-assert-redactions
branch
from
b90ba01
to
190ef86
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 15, 2024
Update cargo 13 commits in 4dcbca118ab7f9ffac4728004c983754bc6a04ff..a1f47ec3f7cd076986f1bfcd7061f2e8cb1a726e 2024-06-11 16:27:02 +0000 to 2024-06-15 01:10:07 +0000 - Change verification order during packaging. (rust-lang/cargo#14074) - Update git2 for libgit2 1.8.1 (rust-lang/cargo#14067) - Fix some documentation misspellings (rust-lang/cargo#14066) - chore(deps): update msrv (1 version) to v1.79 (rust-lang/cargo#14063) - test: Redact conditional compile-fail warning (rust-lang/cargo#14064) - Migrate a few test files to snapbox (rust-lang/cargo#14048) - docs(contrib): Improve triage instructions (rust-lang/cargo#14052) - chore(ci): Upgrade cargo-semver-checks (rust-lang/cargo#14062) - Revert rust-lang/cargo#13630 as rustc ignores `-C strip` on MSVC (rust-lang/cargo#14061) - test: migrate features_are_quoted to snapbox (rust-lang/cargo#14051) - Add assert redactions (rust-lang/cargo#14054) - test: migrate build_script_env to snapbox (rust-lang/cargo#14044) - docs: Iterate on --breaking docs (rust-lang/cargo#14047) r? ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This was split out from #14048 so that the test changes in that PR do not block the redactions.
This adds auto-redactions for:
[HASH]for/<file>-<16 char hash>[HOST_TARGET][ALT_TARGET][AVG_ELAPSED]benchoutput[JITTER]benchoutputThis also moves all common redactions to a function that
assert_e2eandassert_uicall to reduce the amount of duplicate code and makes it so we only compile regex redactions once.