Skip to content

Commit

Permalink
Auto merge of #14223 - epage:progress, r=eth3lbert
Browse files Browse the repository at this point in the history
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
```
  • Loading branch information
bors committed Jul 9, 2024
2 parents 519c121 + 955faa1 commit 471287f
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions tests/testsuite/progress.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,9 @@ fn always_shows_progress() {
p.cargo("check")
.with_stderr_data(
str![[r#"
[DOWNLOADING] 1 crate
[DOWNLOADING] 2 crates
[DOWNLOADING] 3 crates
[DOWNLOADING] [..] crate
[DOWNLOADED] 3 crates ([..]KB) in [..]s
[BUILDING] [..] 0/4: [..]
[BUILDING] [..] 3/4: foo
[BUILDING] [..] [..]/4: [..]
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
...
"#]]
Expand Down

0 comments on commit 471287f

Please sign in to comment.