fix: simplify flush

Parkreiner · Parkreiner · commit d7cc50ef2b96 · 2025-02-28T22:35:03.000Z
diff --git a/coderd/httpapi/httpapi_test.go b/coderd/httpapi/httpapi_test.go
@@ -163,8 +163,8 @@ func TestWebsocketCloseMsg(t *testing.T) {
 // but it must also implement http.Hijack
 type mockWsResponseWriter struct {
 	recorder         http.ResponseWriter
-	serverConn       net.Conn
 	clientConn       net.Conn
+	serverConn       net.Conn
 	serverReadWriter *bufio.ReadWriter
 }
 
@@ -173,9 +173,7 @@ func (m mockWsResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
 }
 
 func (m mockWsResponseWriter) Flush() {
-	if f, ok := m.recorder.(http.Flusher); ok {
-		f.Flush()
-	}
+	_ = m.serverReadWriter.Flush()
 }
 
 func (m mockWsResponseWriter) Header() http.Header {

Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,8 @@ func TestWebsocketCloseMsg(t *testing.T) {`
`163`	`163`	`// but it must also implement http.Hijack`
`164`	`164`	`type mockWsResponseWriter struct {`
`165`	`165`	`recorder http.ResponseWriter`
`166`		`- serverConn net.Conn`
`167`	`166`	`clientConn net.Conn`
	`167`	`+ serverConn net.Conn`
`168`	`168`	`serverReadWriter *bufio.ReadWriter`
`169`	`169`	`}`
`170`	`170`
`@@ -173,9 +173,7 @@ func (m mockWsResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`func (m mockWsResponseWriter) Flush() {`
`176`		`- if f, ok := m.recorder.(http.Flusher); ok {`
`177`		`- f.Flush()`
`178`		`- }`
	`176`	`+ _ = m.serverReadWriter.Flush()`
`179`	`177`	`}`
`180`	`178`
`181`	`179`	`func (m mockWsResponseWriter) Header() http.Header {`