Skip to content

Commit 471287f

Browse files
committed
Auto merge of #14223 - epage:progress, r=eth3lbert
test(progress): Resolve flakiness This is a follow up to #14181 which broke CI in #14221 ``` ---- progress::always_shows_progress stdout ---- running `/Users/runner/work/cargo/cargo/target/debug/cargo check` thread 'progress::always_shows_progress' panicked at tests/testsuite/progress.rs:128:10: ---- expected: tests/testsuite/progress.rs:116:13 ++++ actual: stderr 1 1 | [DOWNLOADING] 1 crate 2 2 | [DOWNLOADING] 2 crates 3 3 | [DOWNLOADING] 3 crates 4 4 | [DOWNLOADED] 3 crates ([..]KB) in [..]s 5 - [BUILDING] [..] 0/4: [..] 6 5 | [BUILDING] [..] 3/4: foo 7 6 | [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s 8 7 | ...∅ Update with SNAPSHOTS=overwrite ```
2 parents 519c121 + 955faa1 commit 471287f

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

tests/testsuite/progress.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,9 @@ fn always_shows_progress() {
114114
p.cargo("check")
115115
.with_stderr_data(
116116
str![[r#"
117-
[DOWNLOADING] 1 crate
118-
[DOWNLOADING] 2 crates
119-
[DOWNLOADING] 3 crates
117+
[DOWNLOADING] [..] crate
120118
[DOWNLOADED] 3 crates ([..]KB) in [..]s
121-
[BUILDING] [..] 0/4: [..]
122-
[BUILDING] [..] 3/4: foo
119+
[BUILDING] [..] [..]/4: [..]
123120
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
124121
...
125122
"#]]

0 commit comments

Comments
 (0)