Skip to content

Commit 581f3bd

Browse files
authored
fix(coderd/httpapi): stop writing websocket frames to ResponseRecorder in test (#25284)
The `mockEventSenderWrite` function in `newOneWayWriter()` wrote WebSocket frame data to both the `net.Pipe` and the `httptest.ResponseRecorder`. After `websocket.Accept()` calls `WriteHeader(101)`, the recorder rejects body writes with `"response status code does not allow body"`. When `HeartbeatClose` sends a ping, the control frame flush routes through the recorder, producing an ERROR-level log that `slogtest` catches as a test failure. Removed the `recorder.Write(b)` call from the write function. The recorder is only needed for header/status inspection; WebSocket frame data should only go through the `net.Pipe`. Closes coder/internal#1521 > 🤖 Generated by Coder Agents
1 parent 024132e commit 581f3bd

1 file changed

Lines changed: 1 addition & 19 deletions

File tree

‎coderd/httpapi/httpapi_test.go‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,6 @@ func (m mockOneWaySocketWriter) WriteHeader(code int) {
193193
m.serverRecorder.WriteHeader(code)
194194
}
195195

196-
type mockEventSenderWrite func(b []byte) (int, error)
197-
198-
func (w mockEventSenderWrite) Write(b []byte) (int, error) {
199-
return w(b)
200-
}
201-
202196
func TestOneWayWebSocketEventSender(t *testing.T) {
203197
t.Parallel()
204198

@@ -220,26 +214,14 @@ func TestOneWayWebSocketEventSender(t *testing.T) {
220214
mockServer, mockClient := net.Pipe()
221215
recorder := httptest.NewRecorder()
222216

223-
var write mockEventSenderWrite = func(b []byte) (int, error) {
224-
serverCount, err := mockServer.Write(b)
225-
if err != nil {
226-
return 0, err
227-
}
228-
recorderCount, err := recorder.Write(b)
229-
if err != nil {
230-
return 0, err
231-
}
232-
return min(serverCount, recorderCount), nil
233-
}
234-
235217
return mockOneWaySocketWriter{
236218
testContext: t,
237219
serverConn: mockServer,
238220
clientConn: mockClient,
239221
serverRecorder: recorder,
240222
serverReadWriter: bufio.NewReadWriter(
241223
bufio.NewReader(mockServer),
242-
bufio.NewWriter(write),
224+
bufio.NewWriter(mockServer),
243225
),
244226
}
245227
}

0 commit comments

Comments
 (0)