Fix data race in 'discard connections' pool test. (#1860)

matthewdale · web-flow · commit a056cbce9aaf · 2024-10-14T10:17:18.000-07:00
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -87,7 +87,7 @@ tasks:
   test-race:
     - go test ${BUILD_TAGS} -timeout {{.TEST_TIMEOUT}}s -race -p 1 ./...
 
-  test-short: go test ${BUILD_TAGS} -timeout 60s -short ./...
+  test-short: go test ${BUILD_TAGS} -timeout 60s -short -race ./...
 
   test-oidc: bash etc/run-oidc-test.sh 'task --silent evg-test-oidc-auth'
 
diff --git a/x/mongo/driver/topology/pool_test.go b/x/mongo/driver/topology/pool_test.go
@@ -890,7 +890,7 @@ func TestPool(t *testing.T) {
 			go func() {
 				select {
 				case nc := <-ncs:
-					_, err = nc.Write([]byte{5, 0, 0, 0, 0})
+					_, err := nc.Write([]byte{5, 0, 0, 0, 0})
 					require.NoError(t, err, "Write error")
 				case <-time.After(100 * time.Millisecond):
 				}

Original file line number	Diff line number	Diff line change
`@@ -890,7 +890,7 @@ func TestPool(t *testing.T) {`
`890`	`890`	`go func() {`
`891`	`891`	`select {`
`892`	`892`	`case nc := <-ncs:`
`893`		`- _, err = nc.Write([]byte{5, 0, 0, 0, 0})`
	`893`	`+ _, err := nc.Write([]byte{5, 0, 0, 0, 0})`
`894`	`894`	`require.NoError(t, err, "Write error")`
`895`	`895`	`case <-time.After(100 * time.Millisecond):`
`896`	`896`	`}`