-
Notifications
You must be signed in to change notification settings - Fork 795
[antithesis] Enable reuse of banff e2e test for antithesis testing #3554
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
27c090a
[antithesis] Enable reuse of banff e2e test for antithesis testing
maru-ava 5398a55
fixup: Fix lint failure
maru-ava b53c1ab
fixup: Update load test
maru-ava e669feb
fixup: self-review
maru-ava d9f5ded
fixup: disable banff execution pending #4049
maru-ava 74d9ec3
Update tests/antithesis/context.go
maru-ava 9052d5f
fixup: Respond to review feedback
maru-ava 95b5937
fixup: Add RecoverAndRethrow as per review feedback
maru-ava 21b742c
fixup: Add panic recovery to load2
maru-ava be47f02
fixup: Ensure text context is canceled immediately
maru-ava 4ba0379
fixup: Ensure GetDefaultParentContext returns a non-nil context
maru-ava 0077c8f
fixup: Revert change making it non-fatal to fail to read randomness
maru-ava af08e65
fixup: Cleanup context usage as per review comment
maru-ava 58674de
fixup: Ensure sleep case is reachable
maru-ava File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -85,10 +85,7 @@ func (l LoadGenerator) Run( | |
default: | ||
} | ||
|
||
ctx, cancel := context.WithTimeout(ctx, testTimeout) | ||
defer cancel() | ||
|
||
execTestWithRecovery(ctx, log, l.test, l.wallets[i]) | ||
execTestWithRecovery(ctx, log, l.test, l.wallets[i], testTimeout) | ||
} | ||
}) | ||
} | ||
|
@@ -98,8 +95,10 @@ func (l LoadGenerator) Run( | |
|
||
// execTestWithRecovery ensures assertion-related panics encountered during test execution are recovered | ||
// and that deferred cleanups are always executed before returning. | ||
func execTestWithRecovery(ctx context.Context, log logging.Logger, test Test, wallet *Wallet) { | ||
func execTestWithRecovery(ctx context.Context, log logging.Logger, test Test, wallet *Wallet, testTimeout time.Duration) { | ||
tc := tests.NewTestContext(log) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Creating a new TestContext here ensures that recovery executes only the cleanups registered to this context. |
||
defer tc.Recover() | ||
test.Run(tc, ctx, wallet) | ||
contextWithTimeout, cancel := context.WithTimeout(ctx, testTimeout) | ||
defer cancel() | ||
test.Run(tc, contextWithTimeout, wallet) | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Moved to execTestWithRecovery to ensure that cancelation is localized to test execution rather than only being performed on goroutine exit.