Merge pull request nutanix-cloud-native#15 from dlipovetsky/test-data-race

test: Fix data race

Author: dkoshkin

make/go.mk

@@ -26,6 +26,7 @@ define go_test
 		-covermode=atomic \
 		-coverprofile=coverage.out \
 		-short \
+		-race \
 		-v \
 		$(if $(GOTEST_RUN),-run "$(GOTEST_RUN)") \
 		./... && \

pkg/handlers/aws/mutation/suite_test.go

@@ -4,6 +4,7 @@
 package mutation
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
@@ -18,12 +19,13 @@ var (
 )
 
 func TestMain(m *testing.M) {
-	setup()
-	defer teardown()
+	setupCtx, cancel := context.WithCancel(ctx)
+	setup(setupCtx)
+	defer teardown(cancel)
 	m.Run()
 }
 
-func setup() {
+func setup(ctx context.Context) {
 	testEnvConfig := helpers.NewTestEnvironmentConfiguration()
 	var err error
 	testEnv, err = testEnvConfig.Build()
@@ -38,7 +40,8 @@ func setup() {
 	}()
 }
 
-func teardown() {
+func teardown(cancel context.CancelFunc) {
+	cancel()
 	if err := testEnv.Stop(); err != nil {
 		panic(fmt.Sprintf("Failed to stop envtest: %v", err))
 	}

pkg/handlers/docker/mutation/suite_test.go

@@ -4,6 +4,7 @@
 package mutation
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
@@ -18,12 +19,13 @@ var (
 )
 
 func TestMain(m *testing.M) {
-	setup()
-	defer teardown()
+	setupCtx, cancel := context.WithCancel(ctx)
+	setup(setupCtx)
+	defer teardown(cancel)
 	m.Run()
 }
 
-func setup() {
+func setup(ctx context.Context) {
 	testEnvConfig := helpers.NewTestEnvironmentConfiguration()
 	var err error
 	testEnv, err = testEnvConfig.Build()
@@ -38,7 +40,8 @@ func setup() {
 	}()
 }
 
-func teardown() {
+func teardown(cancel context.CancelFunc) {
+	cancel()
 	if err := testEnv.Stop(); err != nil {
 		panic(fmt.Sprintf("Failed to stop envtest: %v", err))
 	}

test/helpers/envtest.go

@@ -132,14 +132,11 @@ func (t *TestEnvironmentConfiguration) Build() (*TestEnvironment, error) {
 
 // StartManager starts the test controller against the local API server.
 func (t *TestEnvironment) StartManager(ctx context.Context) error {
-	ctx, cancel := context.WithCancel(ctx)
-	t.cancel = cancel
 	return t.Manager.Start(ctx)
 }
 
 // Stop stops the test environment.
 func (t *TestEnvironment) Stop() error {
-	t.cancel()
 	return t.env.Stop()
 }