sql: deflake TestPrepareInExplicitTransactionDoesNotDeadlock#161888
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Jan 28, 2026
Merged
sql: deflake TestPrepareInExplicitTransactionDoesNotDeadlock#161888craig[bot] merged 1 commit intocockroachdb:masterfrom
craig[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
DrewKimball
requested review from
a team and
michae2
and removed request for
a team
Member
|
This change is |
DrewKimball
force-pushed
the
deflake-test
branch
2 times, most recently
from
5a468b5 to
00a2a2f
Compare
This commit modifies TestPrepareInExplicitTransactionDoesNotDeadlock to check the error code rather than matching against the error message, which is error-prone. This should stop the test from flaking. Fixes cockroachdb#161803 Release note: None
DrewKimball
force-pushed
the
deflake-test
branch
from
00a2a2f to
f2a56bc
Compare
Collaborator
Author
|
Probably don't need to backport this one right now, since it's quite rare. |
michae2
approved these changes
Jan 28, 2026
Collaborator
michae2
left a comment
michae2
left a comment
There was a problem hiding this comment.
@michae2 reviewed 1 file and all commit messages, and made 1 comment.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @DrewKimball).
Collaborator
Author
|
TFTR! bors r=michae2 |
Contributor
celeste-cockroachdb
Bot
added
v26.2.0-prerelease
and removed
target-release-26.2.0
labels
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
3 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.
This commit modifies TestPrepareInExplicitTransactionDoesNotDeadlock to check the error code rather than matching against the error message, which is error-prone. This should stop the test from flaking.
Fixes #161803
Release note: None