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

[v15] Fix racy X11 forwarding test #48070

Merged
merged 2 commits into from
Oct 29, 2024
Merged

[v15] Fix racy X11 forwarding test #48070

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad01c8d
Fix racy X11 forwarding test
zmb3 Oct 28, 2024
9357d42
Merge branch 'branch/v15' into bot/backport-48045-branch/v15
zmb3 Oct 29, 2024
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
6 changes: 3 additions & 3 deletions integration/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4852,7 +4852,7 @@ func testX11Forwarding(t *testing.T, suite *integrationTestSuite) {

// Reading the display may fail if the session is not fully initialized
// and the write to stdin is swallowed.
var display string
display := make(chan string, 1)
require.EventuallyWithT(t, func(t *assert.CollectT) {
// enter 'printenv DISPLAY > /path/to/tmp/file' into the session (dumping the value of DISPLAY into the temp file)
_, err = keyboard.Write([]byte(fmt.Sprintf("printenv %v > %s\n\r", x11.DisplayEnv, tmpFile.Name())))
Expand All @@ -4861,15 +4861,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))
display <- strings.TrimSpace(string(output))
return true
}
return false
}, time.Second, 100*time.Millisecond, "failed to read display")
}, 10*time.Second, time.Second)

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

conn, err := serverDisplay.Dial()
Expand Down
Loading