Commit49c7648

authored

chore: Close idle connections on test cleanup (#4993)

It's possible that this was the source of a leak on Windows...

1 parent30e9ecb commit49c7648Copy full SHA for 49c7648

File tree

+14

-1

lines changed

+14

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -568,6 +568,7 @@ func Server(vip viper.Viper, newAPI func(context.Context, coderd.Options) (*co`
`568`	`568`	`InsecureSkipVerify:true,`
`569`	`569`	`},`
`570`	`570`	`}`
	`571`	`+deferclient.HTTPClient.CloseIdleConnections()`
`571`	`572`	`}`
`572`	`573`
`573`	`574`	`// Since errCh only has one buffered slot, all routines`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -425,6 +425,7 @@ func TestServer(t *testing.T) {`
`425`	`425`	`},`
`426`	`426`	`},`
`427`	`427`	`}`
	`428`	`+deferclient.HTTPClient.CloseIdleConnections()`
`428`	`429`
`429`	`430`	`// Use the first certificate and hostname.`
`430`	`431`	`client.URL.Host="alpaca.com:443"`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -299,12 +299,14 @@ func NewWithAPI(t testing.T, options Options) (codersdk.Client, io.Closer, c`
`299`	`299`	`ifoptions.IncludeProvisionerDaemon {`
`300`	`300`	`provisionerCloser=NewProvisionerDaemon(t,coderAPI)`
`301`	`301`	`}`
	`302`	`+client:=codersdk.New(coderAPI.AccessURL)`
`302`	`303`	`t.Cleanup(func() {`
`303`	`304`	`cancelFunc()`
`304`	`305`	`_=provisionerCloser.Close()`
`305`	`306`	`_=coderAPI.Close()`
	`307`	`+client.HTTPClient.CloseIdleConnections()`
`306`	`308`	`})`
`307`		`-returncodersdk.New(coderAPI.AccessURL),provisionerCloser,coderAPI`
	`309`	`+returnclient,provisionerCloser,coderAPI`
`308`	`310`	`}`
`309`	`311`
`310`	`312`	`// NewProvisionerDaemon launches a provisionerd instance configured to work`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,9 @@ func setupProxyTest(t testing.T, customAppHost ...string) (codersdk.Client, co`
`135`	`135`	`return (&net.Dialer{}).DialContext(ctx,network,client.URL.Host)`
`136`	`136`	`}`
`137`	`137`	`client.HTTPClient.Transport=transport`
	`138`	`+t.Cleanup(func() {`
	`139`	`+transport.CloseIdleConnections()`
	`140`	`+})`
`138`	`141`
`139`	`142`	`returnclient,user,workspace,uint16(tcpAddr.Port)`
`140`	`143`	`}`
`@@ -540,6 +543,9 @@ func TestWorkspaceAppsProxySubdomainPassthrough(t *testing.T) {`
`540`	`543`	`return (&net.Dialer{}).DialContext(ctx,network,client.URL.Host)`
`541`	`544`	`}`
`542`	`545`	`client.HTTPClient.Transport=transport`
	`546`	`+t.Cleanup(func() {`
	`547`	`+transport.CloseIdleConnections()`
	`548`	`+})`
`543`	`549`
`544`	`550`	`ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitLong)`
`545`	`551`	`defercancel()`
`@@ -579,6 +585,9 @@ func TestWorkspaceAppsProxySubdomainBlocked(t *testing.T) {`
`579`	`585`	`return (&net.Dialer{}).DialContext(ctx,network,client.URL.Host)`
`580`	`586`	`}`
`581`	`587`	`client.HTTPClient.Transport=transport`
	`588`	`+t.Cleanup(func() {`
	`589`	`+transport.CloseIdleConnections()`
	`590`	`+})`
`582`	`591`
`583`	`592`	`returnclient`
`584`	`593`	`}`

Comments

(0)