Run tests in parallel (#2537)

nginx · Sep 12, 2024 · ea7ef87 · ea7ef87
1 parent 74724a6
commit ea7ef87
Show file tree

Hide file tree

Showing 22 changed files with 83 additions and 0 deletions.
diff --git a/internal/mode/provisioner/provisioner_suite_test.go b/internal/mode/provisioner/provisioner_suite_test.go
@@ -8,6 +8,7 @@ import (
 )
 
 func TestProvisioner(t *testing.T) {
+	t.Parallel()
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Provisioner Suite")
 }
diff --git a/internal/mode/static/config_updater_test.go b/internal/mode/static/config_updater_test.go
@@ -103,6 +103,7 @@ func TestUpdateControlPlane(t *testing.T) {
 }
 
 func TestValidateLogLevel(t *testing.T) {
+	t.Parallel()
 	validLevels := []ngfAPI.ControllerLogLevel{
 		ngfAPI.ControllerLogLevelError,
 		ngfAPI.ControllerLogLevelInfo,
@@ -125,6 +126,7 @@ func TestValidateLogLevel(t *testing.T) {
 
 	for _, level := range invalidLevels {
 		t.Run(fmt.Sprintf("invalid level %q", level), func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			g.Expect(validateLogLevel(level)).ToNot(Succeed())

diff --git a/internal/mode/static/health_test.go b/internal/mode/static/health_test.go
@@ -7,6 +7,7 @@ import (
 )
 
 func TestReadyCheck(t *testing.T) {
+	t.Parallel()
 	g := NewWithT(t)
 	nginxChecker := newNginxConfiguredOnStartChecker()
 	g.Expect(nginxChecker.readyCheck(nil)).ToNot(Succeed())

diff --git a/internal/mode/static/log_level_setters_test.go b/internal/mode/static/log_level_setters_test.go
@@ -11,6 +11,7 @@ import (
 )
 
 func TestMultiLogLevelSetter_SetLevel(t *testing.T) {
+	t.Parallel()
 	g := NewWithT(t)
 
 	logr1 := &staticfakes.FakeLogLevelSetter{}
@@ -41,6 +42,7 @@ func TestMultiLogLevelSetter_SetLevel(t *testing.T) {
 }
 
 func TestZapLogLevelSetter_SetLevel(t *testing.T) {
+	t.Parallel()
 	g := NewWithT(t)
 
 	zapSetter := newZapLogLevelSetter(zap.NewAtomicLevel())
@@ -58,6 +60,7 @@ func TestZapLogLevelSetter_SetLevel(t *testing.T) {
 }
 
 func TestPromLogLevelSetter_SetLevel(t *testing.T) {
+	t.Parallel()
 	g := NewWithT(t)
 
 	logger, err := newLeveledPrometheusLogger()

diff --git a/internal/mode/static/manager_test.go b/internal/mode/static/manager_test.go
@@ -22,6 +22,7 @@ import (
 )
 
 func TestPrepareFirstEventBatchPreparerArgs(t *testing.T) {
+	t.Parallel()
 	const gcName = "nginx"
 
 	partialObjectMetadataList := &metav1.PartialObjectMetadataList{}
@@ -117,6 +118,7 @@ func TestPrepareFirstEventBatchPreparerArgs(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			objects, objectLists := prepareFirstEventBatchPreparerArgs(gcName, test.gwNsName, test.experimentalEnabled)
@@ -128,6 +130,7 @@ func TestPrepareFirstEventBatchPreparerArgs(t *testing.T) {
 }
 
 func TestGetMetricsOptions(t *testing.T) {
+	t.Parallel()
 	tests := []struct {
 		name            string
 		expectedOptions metricsserver.Options
@@ -166,6 +169,7 @@ func TestGetMetricsOptions(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			metricsServerOptions := getMetricsOptions(test.metricsConfig)

diff --git a/internal/mode/static/nginx/file/file_suite_test.go b/internal/mode/static/nginx/file/file_suite_test.go
@@ -8,6 +8,7 @@ import (
 )
 
 func TestFile(t *testing.T) {
+	t.Parallel()
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "File Suite")
 }
diff --git a/internal/mode/static/nginx/file/folders_test.go b/internal/mode/static/nginx/file/folders_test.go
@@ -21,6 +21,7 @@ func writeFile(t *testing.T, name string, data []byte) {
 }
 
 func TestClearFoldersRemoves(t *testing.T) {
+	t.Parallel()
 	g := NewWithT(t)
 
 	tempDir := t.TempDir()
@@ -41,6 +42,7 @@ func TestClearFoldersRemoves(t *testing.T) {
 }
 
 func TestClearFoldersFails(t *testing.T) {
+	t.Parallel()
 	files := []string{"file"}
 
 	testErr := errors.New("test error")
@@ -78,6 +80,7 @@ func TestClearFoldersFails(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			removedFiles, err := file.ClearFolders(test.fileMgr, files)

diff --git a/internal/mode/static/nginx/runtime/manager_test.go b/internal/mode/static/nginx/runtime/manager_test.go
@@ -223,6 +223,7 @@ var _ = Describe("NGINX Runtime Manager", func() {
 })
 
 func TestFindMainProcess(t *testing.T) {
+	t.Parallel()
 	readFileFuncGen := func(content []byte) runtime.ReadFileFunc {
 		return func(name string) ([]byte, error) {
 			if name != runtime.PidFile {
@@ -311,6 +312,7 @@ func TestFindMainProcess(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 			p := runtime.NewProcessHandlerImpl(
 				test.readFile,

diff --git a/internal/mode/static/nginx/runtime/runtime_suite_test.go b/internal/mode/static/nginx/runtime/runtime_suite_test.go
@@ -8,6 +8,7 @@ import (
 )
 
 func TestRuntime(t *testing.T) {
+	t.Parallel()
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Runtime Suite")
 }
diff --git a/internal/mode/static/nginx/runtime/verify_test.go b/internal/mode/static/nginx/runtime/verify_test.go
@@ -30,6 +30,7 @@ func getTestHTTPClient() *http.Client {
 }
 
 func TestVerifyClient(t *testing.T) {
+	t.Parallel()
 	c := VerifyClient{
 		client:  getTestHTTPClient(),
 		timeout: 25 * time.Millisecond,
@@ -87,6 +88,7 @@ func TestVerifyClient(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			err := c.WaitForCorrectVersion(test.ctx, test.expectedVersion, "/childfile", []byte("1 2 3"), test.readFile)
@@ -101,6 +103,7 @@ func TestVerifyClient(t *testing.T) {
 }
 
 func TestEnsureNewNginxWorkers(t *testing.T) {
+	t.Parallel()
 	previousContents := []byte("1 2 3")
 	newContents := []byte("4 5 6")
 
@@ -163,6 +166,7 @@ func TestEnsureNewNginxWorkers(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			err := ensureNewNginxWorkers(

diff --git a/internal/mode/static/sort/sort_test.go b/internal/mode/static/sort/sort_test.go
@@ -11,6 +11,7 @@ import (
 )
 
 func TestLessObjectMeta(t *testing.T) {
+	t.Parallel()
 	before := metav1.Now()
 	later := metav1.NewTime(before.Add(1 * time.Second))
 
@@ -80,6 +81,7 @@ func TestLessObjectMeta(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			result := LessObjectMeta(test.meta1, test.meta2)
@@ -92,6 +94,7 @@ func TestLessObjectMeta(t *testing.T) {
 }
 
 func TestLessClientObject(t *testing.T) {
+	t.Parallel()
 	before := metav1.Now()
 	later := metav1.NewTime(before.Add(1 * time.Second))
 
@@ -177,6 +180,7 @@ func TestLessClientObject(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			result := LessClientObject(test.obj1, test.obj2)

diff --git a/internal/mode/static/static_suite_test.go b/internal/mode/static/static_suite_test.go
@@ -8,6 +8,7 @@ import (
 )
 
 func TestStatic(t *testing.T) {
+	t.Parallel()
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Static Suite")
 }
diff --git a/internal/mode/static/status/prepare_requests_test.go b/internal/mode/static/status/prepare_requests_test.go
@@ -212,6 +212,7 @@ var (
 )
 
 func TestBuildHTTPRouteStatuses(t *testing.T) {
+	t.Parallel()
 	hrValid := &v1.HTTPRoute{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace:  "test",
@@ -291,6 +292,7 @@ func TestBuildHTTPRouteStatuses(t *testing.T) {
 }
 
 func TestBuildGRPCRouteStatuses(t *testing.T) {
+	t.Parallel()
 	grValid := &v1.GRPCRoute{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace:  "test",
@@ -369,6 +371,7 @@ func TestBuildGRPCRouteStatuses(t *testing.T) {
 }
 
 func TestBuildTLSRouteStatuses(t *testing.T) {
+	t.Parallel()
 	trValid := &v1alpha2.TLSRoute{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace:  "test",
@@ -445,6 +448,7 @@ func TestBuildTLSRouteStatuses(t *testing.T) {
 }
 
 func TestBuildRouteStatusesNginxErr(t *testing.T) {
+	t.Parallel()
 	const gatewayCtlrName = "controller"
 
 	hr1 := &v1.HTTPRoute{
@@ -546,6 +550,7 @@ func TestBuildRouteStatusesNginxErr(t *testing.T) {
 }
 
 func TestBuildGatewayClassStatuses(t *testing.T) {
+	t.Parallel()
 	transitionTime := helpers.PrepareTimeForFakeClient(metav1.Now())
 
 	tests := []struct {
@@ -638,6 +643,7 @@ func TestBuildGatewayClassStatuses(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			k8sClient := createK8sClientFor(&v1.GatewayClass{})
@@ -676,6 +682,7 @@ func TestBuildGatewayClassStatuses(t *testing.T) {
 }
 
 func TestBuildGatewayStatuses(t *testing.T) {
+	t.Parallel()
 	createGateway := func() *v1.Gateway {
 		return &v1.Gateway{
 			ObjectMeta: metav1.ObjectMeta{
@@ -1131,6 +1138,7 @@ func TestBuildGatewayStatuses(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			k8sClient := createK8sClientFor(&v1.Gateway{})
@@ -1176,6 +1184,7 @@ func TestBuildGatewayStatuses(t *testing.T) {
 }
 
 func TestBuildBackendTLSPolicyStatuses(t *testing.T) {
+	t.Parallel()
 	const gatewayCtlrName = "controller"
 
 	transitionTime := helpers.PrepareTimeForFakeClient(metav1.Now())
@@ -1357,6 +1366,7 @@ func TestBuildBackendTLSPolicyStatuses(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			k8sClient := createK8sClientFor(&v1alpha3.BackendTLSPolicy{})
@@ -1386,6 +1396,7 @@ func TestBuildBackendTLSPolicyStatuses(t *testing.T) {
 }
 
 func TestBuildNginxGatewayStatus(t *testing.T) {
+	t.Parallel()
 	transitionTime := helpers.PrepareTimeForFakeClient(metav1.Now())
 
 	tests := []struct {
@@ -1449,6 +1460,7 @@ func TestBuildNginxGatewayStatus(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			k8sClient := createK8sClientFor(&ngfAPI.NginxGateway{})
@@ -1479,6 +1491,7 @@ func TestBuildNginxGatewayStatus(t *testing.T) {
 }
 
 func TestBuildNGFPolicyStatuses(t *testing.T) {
+	t.Parallel()
 	const gatewayCtlrName = "controller"
 
 	transitionTime := helpers.PrepareTimeForFakeClient(metav1.Now())
@@ -1741,6 +1754,7 @@ func TestBuildNGFPolicyStatuses(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			k8sClient := createK8sClientFor(&ngfAPI.ClientSettingsPolicy{})