Skip to content

Commit 5cfa708

Browse files
coadlercoadler
authored
chore: attempt to fix windows goleak failures (coder#8753)
1 parent 6af1f6a commit 5cfa708

File tree

1 file changed

+24
-18
lines changed

1 file changed

+24
-18
lines changed

‎cli/templateedit_test.go

+24-18
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,9 @@ func TestTemplateEdit(t *testing.T) {
355355

356356
// Otherwise, proxy the request to the real API server.
357357
rp := httputil.NewSingleHostReverseProxy(client.URL)
358-
rp.Transport = &http.Transport{
359-
DisableKeepAlives: true,
360-
}
358+
tp := &http.Transport{}
359+
defer tp.CloseIdleConnections()
360+
rp.Transport = tp
361361
rp.ServeHTTP(w, r)
362362
}))
363363
t.Cleanup(proxy.Close)
@@ -367,6 +367,7 @@ func TestTemplateEdit(t *testing.T) {
367367
require.NoError(t, err)
368368
proxyClient := codersdk.New(proxyURL)
369369
proxyClient.SetSessionToken(client.SessionToken())
370+
t.Cleanup(proxyClient.HTTPClient.CloseIdleConnections)
370371

371372
cases := []struct {
372373
name string
@@ -484,9 +485,9 @@ func TestTemplateEdit(t *testing.T) {
484485

485486
// Otherwise, proxy the request to the real API server.
486487
rp := httputil.NewSingleHostReverseProxy(client.URL)
487-
rp.Transport = &http.Transport{
488-
DisableKeepAlives: true,
489-
}
488+
tp := &http.Transport{}
489+
defer tp.CloseIdleConnections()
490+
rp.Transport = tp
490491
rp.ServeHTTP(w, r)
491492
}))
492493
defer proxy.Close()
@@ -496,6 +497,7 @@ func TestTemplateEdit(t *testing.T) {
496497
require.NoError(t, err)
497498
proxyClient := codersdk.New(proxyURL)
498499
proxyClient.SetSessionToken(client.SessionToken())
500+
t.Cleanup(proxyClient.HTTPClient.CloseIdleConnections)
499501

500502
// Test the cli command.
501503
cmdArgs := []string{
@@ -604,9 +606,9 @@ func TestTemplateEdit(t *testing.T) {
604606

605607
// Otherwise, proxy the request to the real API server.
606608
rp := httputil.NewSingleHostReverseProxy(client.URL)
607-
rp.Transport = &http.Transport{
608-
DisableKeepAlives: true,
609-
}
609+
tp := &http.Transport{}
610+
defer tp.CloseIdleConnections()
611+
rp.Transport = tp
610612
rp.ServeHTTP(w, r)
611613
}))
612614
defer proxy.Close()
@@ -616,6 +618,7 @@ func TestTemplateEdit(t *testing.T) {
616618
require.NoError(t, err)
617619
proxyClient := codersdk.New(proxyURL)
618620
proxyClient.SetSessionToken(client.SessionToken())
621+
t.Cleanup(proxyClient.HTTPClient.CloseIdleConnections)
619622

620623
// Test the cli command.
621624
cmdArgs := []string{
@@ -695,9 +698,9 @@ func TestTemplateEdit(t *testing.T) {
695698

696699
// Otherwise, proxy the request to the real API server.
697700
rp := httputil.NewSingleHostReverseProxy(client.URL)
698-
rp.Transport = &http.Transport{
699-
DisableKeepAlives: true,
700-
}
701+
tp := &http.Transport{}
702+
defer tp.CloseIdleConnections()
703+
rp.Transport = tp
701704
rp.ServeHTTP(w, r)
702705
}))
703706
defer proxy.Close()
@@ -707,6 +710,7 @@ func TestTemplateEdit(t *testing.T) {
707710
require.NoError(t, err)
708711
proxyClient := codersdk.New(proxyURL)
709712
proxyClient.SetSessionToken(client.SessionToken())
713+
t.Cleanup(proxyClient.HTTPClient.CloseIdleConnections)
710714

711715
// Test the cli command.
712716
cmdArgs := []string{
@@ -831,9 +835,9 @@ func TestTemplateEdit(t *testing.T) {
831835

832836
// Otherwise, proxy the request to the real API server.
833837
rp := httputil.NewSingleHostReverseProxy(client.URL)
834-
rp.Transport = &http.Transport{
835-
DisableKeepAlives: true,
836-
}
838+
tp := &http.Transport{}
839+
defer tp.CloseIdleConnections()
840+
rp.Transport = tp
837841
rp.ServeHTTP(w, r)
838842
}))
839843
defer proxy.Close()
@@ -843,6 +847,7 @@ func TestTemplateEdit(t *testing.T) {
843847
require.NoError(t, err)
844848
proxyClient := codersdk.New(proxyURL)
845849
proxyClient.SetSessionToken(client.SessionToken())
850+
t.Cleanup(proxyClient.HTTPClient.CloseIdleConnections)
846851

847852
// Test the cli command with --allow-user-autostart.
848853
cmdArgs := []string{
@@ -940,9 +945,9 @@ func TestTemplateEdit(t *testing.T) {
940945

941946
// Otherwise, proxy the request to the real API server.
942947
rp := httputil.NewSingleHostReverseProxy(client.URL)
943-
rp.Transport = &http.Transport{
944-
DisableKeepAlives: true,
945-
}
948+
tp := &http.Transport{}
949+
defer tp.CloseIdleConnections()
950+
rp.Transport = tp
946951
rp.ServeHTTP(w, r)
947952
}))
948953
defer proxy.Close()
@@ -952,6 +957,7 @@ func TestTemplateEdit(t *testing.T) {
952957
require.NoError(t, err)
953958
proxyClient := codersdk.New(proxyURL)
954959
proxyClient.SetSessionToken(client.SessionToken())
960+
t.Cleanup(proxyClient.HTTPClient.CloseIdleConnections)
955961

956962
// Test the cli command.
957963
cmdArgs := []string{

0 commit comments

Comments
 (0)