Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: relax assertions of panic message (again) #12500

Merged
merged 1 commit into from
Aug 14, 2023

Conversation

weihanglo
Copy link
Member

What does this PR try to resolve?

Fixes test failure in rust-lang/rust#111071

Similar PR in the past: #12413

How to test

Built std from rust-lang/rust#111071 and test against Cargo's test suite in this PR.

@rustbot
Copy link
Collaborator

rustbot commented Aug 14, 2023

r? @ehuss

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 14, 2023
.with_stdout_contains("[..]assertion failed[..]")
.with_stdout_contains("[..]left: `\"hello\"`[..]")
.with_stdout_contains("[..]right: `\"nope\"`[..]")
.with_stdout_contains("[..]assertion [..]failed[..]")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @weihanglo! Does [..] match .* or .+ (in regex terms)?

Copy link
Member Author

@weihanglo weihanglo Aug 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, similar to .* for a line. Please see https://doc.rust-lang.org/nightly/nightly-rustc/cargo_test_support/compare/index.html.

I am doing this because it need to match both stable and nightly formats to pass Cargo's CI 🥲

@epage
Copy link
Contributor

epage commented Aug 14, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 14, 2023

📌 Commit 689defd 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 Aug 14, 2023
@bors
Copy link
Collaborator

bors commented Aug 14, 2023

⌛ Testing commit 689defd with merge fdd0d27...

@epage
Copy link
Contributor

epage commented Aug 14, 2023

I'd be tempted to say RenovateBot should update our nightly every night but that would get tedious to merge and would flood our commit history

@bors
Copy link
Collaborator

bors commented Aug 14, 2023

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

1 similar comment
@bors
Copy link
Collaborator

bors commented Aug 14, 2023

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

@bors
Copy link
Collaborator

bors commented Aug 14, 2023

👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through a pull request.

@bors bors merged commit fdd0d27 into rust-lang:master Aug 14, 2023
18 of 19 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 14, 2023
Update cargo

6 commits in 7e9de3f4ec3708f500bec142317895b96131e47c..7c3904d6c3ed54e8a413023519b55a536ad44d5b
2023-08-13 00:47:32 +0000 to 2023-08-14 20:11:43 +0000
- fix(lints): Doctest extraction should respect `[lints]` (rust-lang/cargo#12501)
- test: relax assertions of panic message (again) (rust-lang/cargo#12500)
- doc(unstable): `cargo test` does not provide `--keep-going` (rust-lang/cargo#12492)
- fix(log): enable ansi color only in terminal (rust-lang/cargo#12488)
- Update cargo-yank.md (rust-lang/cargo#12490)
- test: bypass `rustc --test` impl details for `-Zfuture-incompat-test` (rust-lang/cargo#12491)

r? `@ghost`
@weihanglo weihanglo deleted the relax-panic-msg branch August 16, 2023 18:56
@ehuss ehuss added this to the 1.73.0 milestone Aug 22, 2023
bors added a commit that referenced this pull request Aug 26, 2023
[stable-1.72.0] add missing `windows-sys` features back

Stable backports:

- <#12563>

In order to make CI pass, the following PRs are also cherry-picked:

- b4a26b0 from #12475
- c508cb6 from #12538
- 43c253e from #12351
- 689defd from #12500

---

Fixes <#12562>

This won't affect Rust releases, i.e. no 1.72.1 will happen. We do this only for release `cargo` crate.
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Apr 7, 2024
Update cargo

6 commits in 7e9de3f4ec3708f500bec142317895b96131e47c..7c3904d6c3ed54e8a413023519b55a536ad44d5b
2023-08-13 00:47:32 +0000 to 2023-08-14 20:11:43 +0000
- fix(lints): Doctest extraction should respect `[lints]` (rust-lang/cargo#12501)
- test: relax assertions of panic message (again) (rust-lang/cargo#12500)
- doc(unstable): `cargo test` does not provide `--keep-going` (rust-lang/cargo#12492)
- fix(log): enable ansi color only in terminal (rust-lang/cargo#12488)
- Update cargo-yank.md (rust-lang/cargo#12490)
- test: bypass `rustc --test` impl details for `-Zfuture-incompat-test` (rust-lang/cargo#12491)

r? `@ghost`
RalfJung pushed a commit to RalfJung/rust-analyzer that referenced this pull request Apr 27, 2024
Update cargo

6 commits in 7e9de3f4ec3708f500bec142317895b96131e47c..7c3904d6c3ed54e8a413023519b55a536ad44d5b
2023-08-13 00:47:32 +0000 to 2023-08-14 20:11:43 +0000
- fix(lints): Doctest extraction should respect `[lints]` (rust-lang/cargo#12501)
- test: relax assertions of panic message (again) (rust-lang/cargo#12500)
- doc(unstable): `cargo test` does not provide `--keep-going` (rust-lang/cargo#12492)
- fix(log): enable ansi color only in terminal (rust-lang/cargo#12488)
- Update cargo-yank.md (rust-lang/cargo#12490)
- test: bypass `rustc --test` impl details for `-Zfuture-incompat-test` (rust-lang/cargo#12491)

r? `@ghost`
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.

6 participants