security: revert increase timeout fix TestOIDCAuthorization_RoleGrantAndRevoke flake#168301
Merged
trunk-io[bot] merged 1 commit intocockroachdb:masterfrom Apr 15, 2026
Merged
Conversation
Contributor
|
😎 Merged successfully - details. |
Member
|
This change is |
…AndRevoke flake This reverts commit 3691c2d (PR cockroachdb#167913). PR cockroachdb#167913 was an auto-generated fix that removed the retry logic added by PR cockroachdb#161381 and replaced it with increased client timeouts. However, PR cockroachdb#161381 already properly addressed the flaky test issue (cockroachdb#159262) by adding retry logic with exponential backoff. The auto-solver's changes were unnecessary and removed a valid fix. Epic: none Release note: None Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
souravcrl
force-pushed
the
revert-167913
branch
from
1ee3efa to
524f8a7
Compare
souravcrl
changed the title
pritesh-lahoti
approved these changes
Apr 14, 2026
Contributor
Author
|
/trunk merge |
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.
Summary
This reverts PR #167913 (commit 3691c2d), which was an auto-generated
fix that removed the retry logic from
performOIDCLoginand replaced itwith increased client timeouts.
retry logic with exponential backoff
unnecessarily removed the working fix from oidcccl: fix TestOIDCAuthorization_RoleGrantAndRevoke flakiness #161381
Reverts #167913
Epic: none
Release note: None
🤖 Generated with Claude Code