poll: fix poll test linter violations

This commit is contained in:
DM
2026-03-12 00:24:45 +03:00
committed by Kristoffer Dalby
parent 4aca9d6568
commit fffc58b5d0

View File

@@ -59,7 +59,10 @@ func (w *delayedSuccessResponseWriter) Write(data []byte) (int, error) {
close(w.firstWriteStarted) close(w.firstWriteStarted)
}) })
time.Sleep(w.firstWriteDelay) timer := time.NewTimer(w.firstWriteDelay)
defer timer.Stop()
<-timer.C
w.firstWriteFinishedOnce.Do(func() { w.firstWriteFinishedOnce.Do(func() {
close(w.firstWriteFinished) close(w.firstWriteFinished)
@@ -117,6 +120,7 @@ func TestGitHubIssue3129_TransientlyBlockedWriteDoesNotLeaveLiveStaleSession(t *
reloadedState, err := state.NewState(app.cfg) reloadedState, err := state.NewState(app.cfg)
require.NoError(t, err) require.NoError(t, err)
app.state = reloadedState app.state = reloadedState
app.mapBatcher = mapper.NewBatcherAndMapper(app.cfg, app.state) app.mapBatcher = mapper.NewBatcherAndMapper(app.cfg, app.state)
@@ -140,6 +144,7 @@ func TestGitHubIssue3129_TransientlyBlockedWriteDoesNotLeaveLiveStaleSession(t *
}, writer, node) }, writer, node)
serveDone := make(chan struct{}) serveDone := make(chan struct{})
go func() { go func() {
session.serveLongPoll() session.serveLongPoll()
close(serveDone) close(serveDone)
@@ -148,11 +153,14 @@ func TestGitHubIssue3129_TransientlyBlockedWriteDoesNotLeaveLiveStaleSession(t *
t.Cleanup(func() { t.Cleanup(func() {
dummyCh := make(chan *tailcfg.MapResponse, 1) dummyCh := make(chan *tailcfg.MapResponse, 1)
_ = app.mapBatcher.AddNode(node.ID, dummyCh, tailcfg.CapabilityVersion(100), nil) _ = app.mapBatcher.AddNode(node.ID, dummyCh, tailcfg.CapabilityVersion(100), nil)
cancel() cancel()
select { select {
case <-serveDone: case <-serveDone:
case <-time.After(2 * time.Second): case <-time.After(2 * time.Second):
} }
_ = app.mapBatcher.RemoveNode(node.ID, dummyCh) _ = app.mapBatcher.RemoveNode(node.ID, dummyCh)
}) })
@@ -163,6 +171,7 @@ func TestGitHubIssue3129_TransientlyBlockedWriteDoesNotLeaveLiveStaleSession(t *
} }
streamsClosed := make(chan struct{}) streamsClosed := make(chan struct{})
go func() { go func() {
app.clientStreamsOpen.Wait() app.clientStreamsOpen.Wait()
close(streamsClosed) close(streamsClosed)