Skip to content

revert(e2e): fix raise timeout for agent-socket cleanup #787

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

Merged
skevetter merged 2 commits into from
Jul 27, 2026
+10 −12
Merged

revert(e2e): fix raise timeout for agent-socket cleanup #787

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf89aef
Revert "fix(e2e): raise timeout for agent-socket cleanup (#786)"
skevetter Jul 27, 2026
fc3bcf2
style: clean comments
skevetter Jul 27, 2026
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
22 changes: 10 additions & 12 deletions e2e/tests/ssh/agent_forward.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,17 +233,16 @@ var _ = ginkgo.Describe(
closeCM()
closed = true

// Per-poll budget must exceed a cold devsy ssh connection's
// setup, or the poll is killed mid-connect and returns empty.
gomega.Eventually(func() (string, error) {
pollCtx, cancel := context.WithTimeout(ctx, 30*time.Second)
gomega.Eventually(func() string {
pollCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel()
return f.DevsySSH(
out, _ := f.DevsySSH(
pollCtx,
tempDir,
"test -S "+sockPath+" && echo PRESENT || echo GONE",
)
}).WithTimeout(90*time.Second).WithPolling(3*time.Second).
return out
}).WithTimeout(30*time.Second).WithPolling(500*time.Millisecond).
Should(
gomega.ContainSubstring("GONE"),
"socket %s must be cleaned up after connection close",
Expand Down Expand Up @@ -307,17 +306,16 @@ var _ = ginkgo.Describe(
exitCmd.Env = append(os.Environ(), "SSH_AUTH_SOCK="+authSock)
_ = exitCmd.Run()

// Assert no devsy-ssh-agent-* dirs remain after close.
gomega.Eventually(func() (string, error) {
pollCtx, cancel := context.WithTimeout(ctx, 30*time.Second)
gomega.Eventually(func() string {
pollCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel()
out, err := f.DevsySSH(
out, _ := f.DevsySSH(
pollCtx,
tempDir,
"sh -c 'ls -d \"$XDG_RUNTIME_DIR\"/devsy-ssh-agent-* 2>/dev/null | wc -l'",
)
return strings.TrimSpace(out), err
}).WithTimeout(90*time.Second).WithPolling(3*time.Second).
return strings.TrimSpace(out)
}).WithTimeout(30*time.Second).WithPolling(500*time.Millisecond).
Should(
gomega.Equal("0"),
"no devsy-ssh-agent-* dir must remain after a no-forward connection closes",
Expand Down
Loading