Skip to content

test(tunnel): wait for listener shutdown after context cancellation #1256

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 1 commit into from
Sep 21, 2026
+16 −4
Merged

test(tunnel): wait for listener shutdown after context cancellation #1256

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions pkg/tunnel/local_listener_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,22 @@ func TestLocalTunnel_ContextCancellation(t *testing.T) {
addr := tun.Addr()
cancel()

time.Sleep(100 * time.Millisecond)
_, err = net.DialTimeout("tcp", addr, 500*time.Millisecond)
if err == nil {
t.Error("expected connection to be refused after context cancellation")
// The listener is closed asynchronously after cancellation.
deadline := time.After(2 * time.Second)
ticker := time.NewTicker(10 * time.Millisecond)
defer ticker.Stop()

for {
conn, err := net.DialTimeout("tcp", addr, 50*time.Millisecond)
if err != nil {
return
}
Comment on lines +193 to +195

@greptile-apps greptile-apps Bot Sep 21, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Dial failure bypasses deadline

The loop returns on a dial error before checking the two-second deadline. If the deadline fires while DialTimeout is still running and the listener closes afterward, the test passes even though shutdown exceeded the intended bound. Check the deadline or elapsed time before treating the dial failure as success.

_ = conn.Close()
select {
case <-deadline:
t.Fatal("listener still accepting connections after context cancellation")
case <-ticker.C:
}
}
}

Expand Down
Loading