Skip to content

Commit e11d172

Browse files
committed
test: Auto-redact file number
1 parent d899ce7 commit e11d172

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

crates/cargo-test-support/src/compare.rs

+5
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,11 @@ fn add_common_redactions(subs: &mut snapbox::Redactions) {
164164
regex!("; finished in (?<redacted>[0-9]+(\\.[0-9]+))s"),
165165
)
166166
.unwrap();
167+
subs.insert(
168+
"[FILE_NUM]",
169+
regex!(r"\[(PACKAGED|REMOVED|SUMMARY)\] (?<redacted>[0-9]+) files"),
170+
)
171+
.unwrap();
167172
subs.insert(
168173
"[FILE_SIZE]",
169174
regex!("(?<redacted>[0-9]+(\\.[0-9]+)([a-zA-Z]i)?)B"),

tests/testsuite/alt_registry.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ fn publish_with_registry_dependency() {
346346
See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for more info.
347347
[PACKAGING] foo v0.0.1 ([ROOT]/foo)
348348
[UPDATING] `alternative` index
349-
[PACKAGED] 4 files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
349+
[PACKAGED] [FILE_NUM] files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
350350
[VERIFYING] foo v0.0.1 ([ROOT]/foo)
351351
[DOWNLOADING] crates ...
352352
[DOWNLOADED] bar v0.0.1 (registry `alternative`)
@@ -512,7 +512,7 @@ fn publish_to_alt_registry() {
512512
[WARNING] manifest has no description, license, license-file, documentation, homepage or repository.
513513
See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for more info.
514514
[PACKAGING] foo v0.0.1 ([ROOT]/foo)
515-
[PACKAGED] 4 files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
515+
[PACKAGED] [FILE_NUM] files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
516516
[VERIFYING] foo v0.0.1 ([ROOT]/foo)
517517
[COMPILING] foo v0.0.1 ([ROOT]/foo/target/package/foo-0.0.1)
518518
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
@@ -591,7 +591,7 @@ fn publish_with_crates_io_dep() {
591591
See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for more info.
592592
[PACKAGING] foo v0.0.1 ([ROOT]/foo)
593593
[UPDATING] `dummy-registry` index
594-
[PACKAGED] 4 files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
594+
[PACKAGED] [FILE_NUM] files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
595595
[VERIFYING] foo v0.0.1 ([ROOT]/foo)
596596
[DOWNLOADING] crates ...
597597
[DOWNLOADED] bar v0.0.1 (registry `dummy-registry`)

tests/testsuite/artifact_dep.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2200,7 +2200,7 @@ fn publish_artifact_dep() {
22002200
.with_stderr_data(str![[r#"
22012201
[UPDATING] crates.io index
22022202
[PACKAGING] foo v0.1.0 ([ROOT]/foo)
2203-
[PACKAGED] 3 files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
2203+
[PACKAGED] [FILE_NUM] files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
22042204
[UPLOADING] foo v0.1.0 ([ROOT]/foo)
22052205
[UPLOADED] foo v0.1.0 to registry `crates-io`
22062206
[NOTE] waiting for `foo v0.1.0` to be available at registry `crates-io`.

0 commit comments

Comments
 (0)