mirror of
https://github.com/coder/coder.git
synced 2026-09-22 05:05:20 +08:00
Cian Johnston
e02d9adc11
Tests that proxy or pool connections to a bare `httptest.Server` intermittently fail on Windows with a bare EOF when a stale pooled connection is reused. net/http will not retry a non-replayable request (e.g. a POST) on a closed pooled connection, so forcing a fresh connection per request eliminates the failure class. This is the same mechanism fixed in #28016 (AIGOV-430 / internal#1564), now expressed as a reusable, behavior-preserving helper. This PR adds `testutil.NewTestHTTPServer`, a known-good wrapper around `httptest.NewServer` that applies some defaults. Currently the only default is disabling keep-alives by default. - `testutil/http_server.go`: `NewHTTPServer(t, handler, opts)` started, with documented defaults, starts automatically, and handles `t.Cleanup`. - `testutil/http_server_test.go`: unit test for defaults and overriding defaults. - `enterprise/aibridgeproxyd/reload_test.go`: refactor the harness's hand-rolled server to the helper. ## Future Work - Functional options are exposed but not explicitly defined. This can be done later as required. - No lint rule or broader migration. A forcing-function analyzer covering more packages, plus wider adoption, belongs in a separate follow-up. ## Verification - `testutil` and `enterprise/aibridgeproxyd` suites pass under `-race`. - `TestProxy_HotReloadRouting` and `TestProxy_StaleTunnel` pass 10x under `-race`. - New helper unit test passes under `-race`. > Generated by a Coder agent.
26 lines
655 B
Go
26 lines
655 B
Go
package testutil
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
)
|
|
|
|
// NewHTTPTestServer return a *httptest.Server with the following
|
|
// defaults set:
|
|
// - keep-alives disabled by default to prevent stale connection reuse (AIGOV-430).
|
|
//
|
|
// Override these defaults via opts if needed.
|
|
// The server is started and will be closed when the test ends.
|
|
func NewHTTPTestServer(t testing.TB, handler http.Handler, opts ...func(*httptest.Server)) *httptest.Server {
|
|
t.Helper()
|
|
srv := httptest.NewUnstartedServer(handler)
|
|
srv.Config.SetKeepAlivesEnabled(false)
|
|
for _, opt := range opts {
|
|
opt(srv)
|
|
}
|
|
srv.Start()
|
|
t.Cleanup(srv.Close)
|
|
return srv
|
|
}
|