Fix flaky test TestIntegrations/X11Forwarding
#50852
Merged
Conversation
This file contains 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
… time to complete, avoid racing on the display channel.
marcoandredinis
approved these changes
Jan 8, 2025
bl-nero
approved these changes
Jan 8, 2025
tigrato
reviewed
Jan 8, 2025
Joerger
added
the
no-changelog
tigrato
approved these changes
Jan 8, 2025
public-teleport-github-review-bot
bot
removed the request for review
from nklaassen
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Joerger
deleted the
joerger/fix-flaky-test-TestIntegrations/X11Forwarding
branch
This was referenced Jan 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 test suffered from the same data race explained in #48045, except that the race could now result in an
assert.Eventuallyattempt sending display (and blocking the channel) after the outerrequire.EventuallyWithThad already moved on to a newassert.Eventuallyattempt with the next tick. The latter attempt would then block ondisplay <- ...and end up failing.The fix I chose is to stagger the outer eventually to ensure the inner eventually attempt has ample time to complete before moving on to another attempt.