Fix coverage tests - #5735
Merged
Merged
Conversation
rdettai
force-pushed
the
fix-coverage-tests
branch
2 times, most recently
from
April 7, 2025 12:20
29a929a to
8f582a0
Compare
Collaborator
Author
rdettai
commented
Apr 7, 2025
Comment on lines
+336
to
-344
| fail::cfg( | ||
| "after-merge-split", | ||
| "panic(merge should be failed by directory kill switch)", | ||
| ) | ||
| .unwrap(); | ||
| merge_executor_mailbox.send_message(merge_scratch).await?; | ||
| before_universe_kill.wait(); | ||
| universe.kill(); | ||
| after_universe_kill.wait(); | ||
| fail::cfg("before-merge-split", "off").unwrap(); | ||
|
|
||
| let (exit_status, _) = merge_executor_handle.join().await; | ||
| assert!(matches!(exit_status, ActorExitStatus::Failure(_))); |
Collaborator
Author
There was a problem hiding this comment.
@fulmicoton-dd I know you wrote this a long time ago, but do you happen to remember why you were testing the merge_executor_handle.join() result instead of using a panic failpoint?
Note: the actor exit status is now Killed instead of Failure because since #5704, merge failures return Ok() with an error!. log instead of failing the actor. But this is not what this test is about, hence the proposed change.
trinity-1686a
approved these changes
Apr 23, 2025
rdettai
force-pushed
the
fix-coverage-tests
branch
from
April 24, 2025 12:30
eba9dbb to
672b689
Compare
rdettai
force-pushed
the
fix-coverage-tests
branch
from
April 30, 2025 09:06
672b689 to
c22b22a
Compare
rdettai
enabled auto-merge (squash)
April 30, 2025 09:07
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
test_merge_executor_controlled_directory_kill_switchis failing since this changeHow was this PR tested?
Describe how you tested this PR.