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.

Sign up for GitHub

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

Jump to bottom

test that we correctly detect panics in intergation tests #11228

Merged
merged 1 commit into from
Jul 26, 2023
Merged

test that we correctly detect panics in intergation tests #11228

merged 1 commit into from
Jul 26, 2023

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jul 25, 2023 •
edited
Loading

should be merged after #11225

changelog: add test for integration tests

@rustbot
Copy link
Collaborator

rustbot commented Jul 25, 2023

r? @flip1995

(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 Jul 25, 2023
@matthiaskrgr
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Jul 25, 2023

⌛ Trying commit 4b982cc with merge 7bc5388...

bors added a commit that referenced this pull request Jul 25, 2023
@bors
Auto merge of #11228 - matthiaskrgr:fix_integration_tests2__with_test…
7bc5388 
…, r=<try>

test that we correctly detect panics in intergation tests

Right now, this should pass as it is on top of #11225

but once I removed that from the pr, I should be able to see the failure.

changelog: add test for integration tests
@bors
Copy link
Contributor

bors commented Jul 25, 2023

💔 Test failed - checks-action_test

@matthiaskrgr matthiaskrgr force-pushed the fix_integration_tests2__with_test branch from 4b982cc to 0416f34 Compare July 25, 2023 18:45
@matthiaskrgr
Copy link
Member Author

Ah yes, forgot a return 🤣
@bors try

@bors
Copy link
Contributor

bors commented Jul 25, 2023

⌛ Trying commit 0416f34 with merge a412192...

bors added a commit that referenced this pull request Jul 25, 2023
@bors
Auto merge of #11228 - matthiaskrgr:fix_integration_tests2__with_test…
a412192 
…, r=<try>

test that we correctly detect panics in intergation tests

Right now, this should pass as it is on top of #11225

but once I removed that from the pr, I should be able to see the failure.

changelog: add test for integration tests
@bors
Copy link
Contributor

bors commented Jul 25, 2023

💔 Test failed - checks-action_test

@matthiaskrgr matthiaskrgr force-pushed the fix_integration_tests2__with_test branch from 0416f34 to 4a12b23 Compare July 25, 2023 18:57
@matthiaskrgr
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Jul 25, 2023

⌛ Trying commit 4a12b23 with merge 955f2e2...

bors added a commit that referenced this pull request Jul 25, 2023
@bors
Auto merge of #11228 - matthiaskrgr:fix_integration_tests2__with_test…
955f2e2 
…, r=<try>

test that we correctly detect panics in intergation tests

Right now, this should pass as it is on top of #11225

but once I removed that from the pr, I should be able to see the failure.

changelog: add test for integration tests
@matthiaskrgr
Copy link
Member Author

Perfect: so on current master (broken integration tests) this now successfully detects the panic 🎉
https://github.com/rust-lang/rust-clippy/actions/runs/5660689271/job/15337050597#step:7:21

once #11225 is merged, this one should merge fine as well

@bors
Copy link
Contributor

bors commented Jul 25, 2023

💔 Test failed - checks-action_test

flip1995
flip1995 approved these changes Jul 26, 2023
View reviewed changes
Copy link
Member

@flip1995 flip1995 left a comment

Choose a reason for hiding this comment

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

r=me once the other PR is merged.

@bors
Copy link
Contributor

bors commented Jul 26, 2023

☔ The latest upstream changes (presumably #11225) made this pull request unmergeable. Please resolve the merge conflicts.

@matthiaskrgr matthiaskrgr force-pushed the fix_integration_tests2__with_test branch from 4a12b23 to 01b9f9d Compare July 26, 2023 15:05
@matthiaskrgr
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Jul 26, 2023

⌛ Trying commit 01b9f9d with merge 13466d0...

bors added a commit that referenced this pull request Jul 26, 2023
@bors
Auto merge of #11228 - matthiaskrgr:fix_integration_tests2__with_test…
13466d0 
…, r=<try>

test that we correctly detect panics in intergation tests

should be merged after #11225

changelog: add test for integration tests
@bors
Copy link
Contributor

bors commented Jul 26, 2023

☀️ Try build successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Build commit: 13466d0 (13466d0c82d26ededc77b8bf013b4517a5b362ac)

@matthiaskrgr
Copy link
Member Author

@bors r=flip1995

@bors
Copy link
Contributor

bors commented Jul 26, 2023

📌 Commit 01b9f9d has been approved by flip1995

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jul 26, 2023

⌛ Testing commit 01b9f9d with merge d446378...

@bors
Copy link
Contributor

bors commented Jul 26, 2023

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995
Pushing d446378 to master...

@bors bors merged commit d446378 into rust-lang:master Jul 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flip1995 flip1995 flip1995 approved these changes

Assignees

@flip1995 flip1995

Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@matthiaskrgr @rustbot @bors @flip1995