Skip to content
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.

Sign up for GitHub

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

[v17] Fix flaky test TestIntegrations/X11Forwarding #50885

Merged
merged 2 commits into from
Jan 9, 2025
Merged

[v17] Fix flaky test TestIntegrations/X11Forwarding #50885

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
075adcd
Stagger outer eventually loop to ensure the inner eventually loop has…
Joerger Jan 8, 2025
726f9f9
Use select case.
Joerger Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions integration/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4850,12 +4850,15 @@ func testX11Forwarding(t *testing.T, suite *integrationTestSuite) {
assert.Eventually(t, func() bool {
output, err := os.ReadFile(tmpFile.Name())
if err == nil && len(output) != 0 {
display <- strings.TrimSpace(string(output))
select {
case display <- strings.TrimSpace(string(output)):
default:
}
return true
}
return false
}, time.Second, 100*time.Millisecond, "failed to read display")
}, 10*time.Second, time.Second)
}, 10*time.Second, 1*time.Second)

// Make a new connection to the XServer proxy to confirm that forwarding is working.
serverDisplay, err := x11.ParseDisplay(<-display)
Expand Down
Loading