Merge d506fe51f9 into 9441b91186

Auto merge of #14159 - dieterplex:migrate-git-snapbox, r=weihanglo
test: Migrate git to snapbox Part of #14039. There is a case need to modify regex for file size redaction.
2024-07-02 16:09:07 +00:00 · 2024-06-28 15:44:34 +02:00 · 2024-06-28 13:05:10 +00:00 · 2024-06-28 17:39:24 +08:00 · 2024-06-27 16:58:52 +08:00
2 changed files with 593 additions and 537 deletions
--- a/crates/cargo-test-support/src/compare.rs
+++ b/crates/cargo-test-support/src/compare.rs
@ -171,7 +171,7 @@ fn add_common_redactions(subs: &mut snapbox::Redactions) {
    .unwrap();
    subs.insert(
        "[FILE_SIZE]",
-        regex!(r"(?<redacted>[0-9]+(\.[0-9]+)([a-zA-Z]i)?)B"),
+        regex!(r"(?<redacted>[0-9]+(\.[0-9]+)?([a-zA-Z]i)?)B\s"),
    )
    .unwrap();
    subs.insert(
--- a/tests/testsuite/git.rs
+++ b/tests/testsuite/git.rs
Author	SHA1	Message	Date
C272	46d7aea257	Merge `d506fe51f9` into `9441b91186`	2024-06-28 15:44:34 +02:00
bors	9441b91186	Auto merge of #14159 - dieterplex:migrate-git-snapbox, r=weihanglo test: Migrate git to snapbox Part of #14039. There is a case need to modify regex for file size redaction.	2024-06-28 13:05:10 +00:00
d1t2	32cdb261ef	test: Migrate git to snapbox	2024-06-28 17:39:24 +08:00
d1t2	ed027736e7	test: Allow redact file size w/o fraction `cargo clean` shows file size without fraction in summary when the size is lower than 1024. And we need to avoid matching things like `%2B%23..` found in other test cases, the trailing `\s` is added to regex.	2024-06-27 16:58:52 +08:00