Skip to content

Conversation

eth3lbert
Copy link
Contributor

What does this PR try to resolve?

Part of #14039.

Migrate following to snapbox:

  • tests/testsuite/patch.rs
  • tests/testsuite/pkgid.rs
  • tests/testsuite/proc_macro.rs
  • tests/testsuite/progress.rs

@rustbot
Copy link
Collaborator

rustbot commented Jul 3, 2024

r? @epage

rustbot has assigned @epage.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 3, 2024
@eth3lbert eth3lbert force-pushed the snapbox-p branch 2 times, most recently from 2ea54b6 to 3c545a2 Compare July 3, 2024 02:35
@epage
Copy link
Contributor

epage commented Jul 5, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Jul 5, 2024

📌 Commit d0c58e2 has been approved by epage

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 5, 2024
@bors
Copy link
Contributor

bors commented Jul 5, 2024

⌛ Testing commit d0c58e2 with merge be1db6c...

@bors
Copy link
Contributor

bors commented Jul 5, 2024

☀️ Test successful - checks-actions
Approved by: epage
Pushing be1db6c to master...

@bors bors merged commit be1db6c into rust-lang:master Jul 5, 2024
eth3lbert added a commit to eth3lbert/cargo that referenced this pull request Jul 5, 2024
This is partial revert of #rust-lang#14185
(fd8a91d)

People are unlikely to see these comments when updating snapshots.
Although the changes made in that commit are valid, for the same reason
mentioned in the comment rust-lang#14181 (comment),
"People are unlikely to see these comments when updating snapshots".
Therefore, it would be better to revert these parts.
eth3lbert added a commit to eth3lbert/cargo that referenced this pull request Jul 5, 2024
This is partial revert of rust-lang#14185
(2706247)

People are unlikely to see these comments when updating snapshots.
Although the changes made in that commit are valid, for the same reason
mentioned in the comment rust-lang#14181 (comment),
"People are unlikely to see these comments when updating snapshots".
Therefore, it would be better to revert these parts.
eth3lbert added a commit to eth3lbert/cargo that referenced this pull request Jul 5, 2024
This is partial revert of rust-lang#14185
(2706247)

Although the changes made in that commit are valid, for the same reason
mentioned in the comment rust-lang#14181 (comment),
"People are unlikely to see these comments when updating snapshots".
Therefore, it would be better to revert these parts.
@eth3lbert eth3lbert deleted the snapbox-p branch July 5, 2024 22:32
bors added a commit that referenced this pull request Jul 5, 2024
…r=weihanglo

fix(test): Restore `does_not_contain` for check

This is partial revert of #14185
(2706247)

Although the changes made in that commit are valid, for the same reason mentioned in the comment #14181 (comment), "People are unlikely to see these comments when updating snapshots". Therefore, it would be better to revert these parts.

---
Let me know if anything's missing!
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 7, 2024
Update cargo

20 commits in a515d463427b3912ec0365d106791f88c1c14e1b..154fdac39ae9629954e19e9986fd2cf2cdd8d964
2024-07-02 20:53:36 +0000 to 2024-07-07 01:28:23 +0000
- test: relax redactions for rust-lang/rust (rust-lang/cargo#14203)
- use "bootstrap" instead of "rustbuild" (rust-lang/cargo#14207)
- test: migrate serveral files to snapbox (rust-lang/cargo#14180)
- Add rustdocflags to Unit's Debug impl (rust-lang/cargo#14201)
- Allow enabling `config-include` feature in config (rust-lang/cargo#14196)
- fix(test): Restore `does_not_contain` for check (rust-lang/cargo#14198)
- test: migrate patch, pkgid, proc_macro and progress to snapbox (rust-lang/cargo#14181)
- test: Migrate jobserver to snapbox (rust-lang/cargo#14191)
- chore(deps): update msrv (3 versions) to v1.77 (rust-lang/cargo#14186)
- test: migrate build_plan and build_script to snapbox (rust-lang/cargo#14193)
- test: migrate cfg and check to snapbox (rust-lang/cargo#14185)
- test: migrate install* and inheritable_workspace_fields to snapbox (rust-lang/cargo#14170)
- Pass rustflags to artifacts built with implicit targets when using target-applies-to-host (rust-lang/cargo#13900)
- test: Migrate network tests to snapbox (rust-lang/cargo#14187)
- test: migrate some files to snapbox (rust-lang/cargo#14113)
- test: Auto-redact `... after last build at ...`; Migrate `freshness` to Snapbox (rust-lang/cargo#14161)
- chore: fix some typos (rust-lang/cargo#14182)
- fix: improve message for inactive weak optional feature with edition2024 through unused dep collection (rust-lang/cargo#14026)
- test:migrate `doc/directory/docscrape` to snapbox (rust-lang/cargo#14171)
- test: Migrate git_auth to snapbox (rust-lang/cargo#14172)
@rustbot rustbot added this to the 1.81.0 milestone Jul 7, 2024
epage added a commit to epage/cargo that referenced this pull request Jul 9, 2024
This is a follow up to rust-lang#14181 which broke CI in rust-lang#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
```
epage added a commit to epage/cargo that referenced this pull request Jul 9, 2024
This is a follow up to rust-lang#14181 which broke CI in rust-lang#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
```
bors added a commit that referenced this pull request Jul 9, 2024
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
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants