chore: Close idle connections on test cleanup

kylecarbs · ammario · commit efb998595b63 · 2022-11-10T18:16:23.000Z
It's possible that this was the source of a leak on Windows...
diff --git a/Makefile b/Makefile
@@ -465,6 +465,7 @@ test: test-clean
 test-postgres: test-clean test-postgres-docker
 	DB=ci DB_FROM=$(shell go run scripts/migrate-ci/main.go) gotestsum --junitfile="gotests.xml" --packages="./..." -- \
 		-covermode=atomic -coverprofile="gotests.coverage" -timeout=20m \
+		-parallel=4 \
 		-coverpkg=./... \
 		-count=1 -race -failfast
 .PHONY: test-postgres
diff --git a/cli/server.go b/cli/server.go
@@ -566,6 +566,7 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co
 						InsecureSkipVerify: true,
 					},
 				}
+				defer client.HTTPClient.CloseIdleConnections()
 			}
 
 			// Since errCh only has one buffered slot, all routines
diff --git a/cli/server_test.go b/cli/server_test.go
@@ -425,6 +425,7 @@ func TestServer(t *testing.T) {
 				},
 			},
 		}
+		defer client.HTTPClient.CloseIdleConnections()
 
 		// Use the first certificate and hostname.
 		client.URL.Host = "alpaca.com:443"
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -298,12 +298,14 @@ func NewWithAPI(t *testing.T, options *Options) (*codersdk.Client, io.Closer, *c
 	if options.IncludeProvisionerDaemon {
 		provisionerCloser = NewProvisionerDaemon(t, coderAPI)
 	}
+	client := codersdk.New(coderAPI.AccessURL)
 	t.Cleanup(func() {
 		cancelFunc()
 		_ = provisionerCloser.Close()
 		_ = coderAPI.Close()
+		client.HTTPClient.CloseIdleConnections()
 	})
-	return codersdk.New(coderAPI.AccessURL), provisionerCloser, coderAPI
+	return client, provisionerCloser, coderAPI
 }
 
 // NewProvisionerDaemon launches a provisionerd instance configured to work
diff --git a/coderd/workspaceapps_test.go b/coderd/workspaceapps_test.go
@@ -135,6 +135,9 @@ func setupProxyTest(t *testing.T, customAppHost ...string) (*codersdk.Client, co
 		return (&net.Dialer{}).DialContext(ctx, network, client.URL.Host)
 	}
 	client.HTTPClient.Transport = transport
+	t.Cleanup(func() {
+		transport.CloseIdleConnections()
+	})
 
 	return client, user, workspace, uint16(tcpAddr.Port)
 }
@@ -540,6 +543,9 @@ func TestWorkspaceAppsProxySubdomainPassthrough(t *testing.T) {
 		return (&net.Dialer{}).DialContext(ctx, network, client.URL.Host)
 	}
 	client.HTTPClient.Transport = transport
+	t.Cleanup(func() {
+		transport.CloseIdleConnections()
+	})
 
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 	defer cancel()
@@ -579,6 +585,9 @@ func TestWorkspaceAppsProxySubdomainBlocked(t *testing.T) {
 			return (&net.Dialer{}).DialContext(ctx, network, client.URL.Host)
 		}
 		client.HTTPClient.Transport = transport
+		t.Cleanup(func() {
+			transport.CloseIdleConnections()
+		})
 
 		return client
 	}

Original file line number	Diff line number	Diff line change
`@@ -566,6 +566,7 @@ func Server(vip viper.Viper, newAPI func(context.Context, coderd.Options) (*co`
`566`	`566`	`InsecureSkipVerify: true,`
`567`	`567`	`},`
`568`	`568`	`}`
	`569`	`+ defer client.HTTPClient.CloseIdleConnections()`
`569`	`570`	`}`
`570`	`571`
`571`	`572`	`// Since errCh only has one buffered slot, all routines`
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`	`+ defer client.HTTPClient.CloseIdleConnections()`
`428`	`429`
`429`	`430`	`// Use the first certificate and hostname.`
`430`	`431`	`client.URL.Host = "alpaca.com:443"`
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`	`return client, 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`	`defer cancel()`
`@@ -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`	`return client`
`584`	`593`	`}`