feat(test): Auto-redact elapsed time

rust-lang · May 28, 2024 · 5ea1c8f · 5ea1c8f
1 parent 11d0002
commit 5ea1c8f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -91,7 +91,7 @@ sha1 = "0.10.6"
 sha2 = "0.10.8"
 shell-escape = "0.1.5"
 supports-hyperlinks = "3.0.0"
-snapbox = { version = "0.6.5", features = ["diff", "dir", "term-svg"] }
+snapbox = { version = "0.6.5", features = ["diff", "dir", "term-svg", "regex"] }
 tar = { version = "0.4.40", default-features = false }
 tempfile = "3.10.1"
 thiserror = "1.0.59"

diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml
@@ -24,6 +24,7 @@ git2.workspace = true
 glob.workspace = true
 itertools.workspace = true
 pasetors.workspace = true
+regex.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 snapbox.workspace = true

diff --git a/crates/cargo-test-support/src/compare.rs b/crates/cargo-test-support/src/compare.rs
@@ -86,6 +86,11 @@ pub fn assert_ui() -> snapbox::Assert {
         .unwrap();
     subs.insert("[ROOT]", root).unwrap();
     subs.insert("[ROOTURL]", root_url).unwrap();
+    subs.insert(
+        "[ELAPSED]",
+        regex::Regex::new("Finished.*in (?<redacted>[0-9]+(\\.[0-9]+))s").unwrap(),
+    )
+    .unwrap();
     snapbox::Assert::new()
         .action_env(snapbox::assert::DEFAULT_ACTION_ENV)
         .redact_with(subs)

diff --git a/tests/testsuite/lints/warning/stderr.term.svg b/tests/testsuite/lints/warning/stderr.term.svg