Run tests in internal/mode/static/nginx/config in parallel (1) (#2493)

lucacome · web-flow · commit c87ec979cebe · 2024-09-03T17:57:54.000Z
diff --git a/internal/mode/static/nginx/config/policies/clientsettings/generator_test.go b/internal/mode/static/nginx/config/policies/clientsettings/generator_test.go
@@ -13,6 +13,7 @@ import (
 )
 
 func TestGenerate(t *testing.T) {
+	t.Parallel()
 	maxSize := helpers.GetPointer[ngfAPI.Size]("10m")
 	bodyTimeout := helpers.GetPointer[ngfAPI.Duration]("600ms")
 	keepaliveRequests := helpers.GetPointer[int32](900)
@@ -149,9 +150,9 @@ func TestGenerate(t *testing.T) {
 		},
 	}
 
-	g := NewWithT(t)
-
-	checkResults := func(resFiles policies.GenerateResultFiles, expStrings []string) {
+	checkResults := func(t *testing.T, resFiles policies.GenerateResultFiles, expStrings []string) {
+		t.Helper()
+		g := NewWithT(t)
 		g.Expect(resFiles).To(HaveLen(1))
 
 		for _, str := range expStrings {
@@ -160,22 +161,24 @@ func TestGenerate(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		t.Run(test.name, func(_ *testing.T) {
+		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			generator := clientsettings.NewGenerator()
 
 			resFiles := generator.GenerateForServer([]policies.Policy{test.policy}, http.Server{})
-			checkResults(resFiles, test.expStrings)
+			checkResults(t, resFiles, test.expStrings)
 
 			resFiles = generator.GenerateForLocation([]policies.Policy{test.policy}, http.Location{})
-			checkResults(resFiles, test.expStrings)
+			checkResults(t, resFiles, test.expStrings)
 
 			resFiles = generator.GenerateForInternalLocation([]policies.Policy{test.policy})
-			checkResults(resFiles, test.expStrings)
+			checkResults(t, resFiles, test.expStrings)
 		})
 	}
 }
 
 func TestGenerateNoPolicies(t *testing.T) {
+	t.Parallel()
 	g := NewWithT(t)
 
 	generator := clientsettings.NewGenerator()
diff --git a/internal/mode/static/nginx/config/policies/clientsettings/validator_test.go b/internal/mode/static/nginx/config/policies/clientsettings/validator_test.go
@@ -53,6 +53,7 @@ func createModifiedPolicy(mod policyModFunc) *ngfAPI.ClientSettingsPolicy {
 }
 
 func TestValidator_Validate(t *testing.T) {
+	t.Parallel()
 	tests := []struct {
 		name          string
 		policy        *ngfAPI.ClientSettingsPolicy
@@ -133,6 +134,7 @@ func TestValidator_Validate(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			conds := v.Validate(test.policy, nil)
@@ -142,6 +144,7 @@ func TestValidator_Validate(t *testing.T) {
 }
 
 func TestValidator_ValidatePanics(t *testing.T) {
+	t.Parallel()
 	v := clientsettings.NewValidator(nil)
 
 	validate := func() {
@@ -154,6 +157,7 @@ func TestValidator_ValidatePanics(t *testing.T) {
 }
 
 func TestValidator_Conflicts(t *testing.T) {
+	t.Parallel()
 	tests := []struct {
 		polA      *ngfAPI.ClientSettingsPolicy
 		polB      *ngfAPI.ClientSettingsPolicy
@@ -256,6 +260,7 @@ func TestValidator_Conflicts(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			g.Expect(v.Conflicts(test.polA, test.polB)).To(Equal(test.conflicts))
@@ -264,6 +269,7 @@ func TestValidator_Conflicts(t *testing.T) {
 }
 
 func TestValidator_ConflictsPanics(t *testing.T) {
+	t.Parallel()
 	v := clientsettings.NewValidator(nil)
 
 	conflicts := func() {
diff --git a/internal/mode/static/nginx/config/policies/observability/generator_test.go b/internal/mode/static/nginx/config/policies/observability/generator_test.go
@@ -15,6 +15,7 @@ import (
 )
 
 func TestGenerate(t *testing.T) {
+	t.Parallel()
 	ratio := helpers.GetPointer[int32](25)
 	zeroRatio := helpers.GetPointer[int32](0)
 	context := helpers.GetPointer[ngfAPI.TraceContext](ngfAPI.TraceContextExtract)
@@ -242,6 +243,7 @@ func TestGenerate(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			generator := observability.NewGenerator(test.telemetryConf)
@@ -280,6 +282,7 @@ func TestGenerate(t *testing.T) {
 }
 
 func TestGenerateNoPolicies(t *testing.T) {
+	t.Parallel()
 	g := NewWithT(t)
 
 	generator := observability.NewGenerator(dataplane.Telemetry{})
diff --git a/internal/mode/static/nginx/config/policies/observability/validator_test.go b/internal/mode/static/nginx/config/policies/observability/validator_test.go
@@ -52,6 +52,7 @@ func createModifiedPolicy(mod policyModFunc) *ngfAPI.ObservabilityPolicy {
 }
 
 func TestValidator_Validate(t *testing.T) {
+	t.Parallel()
 	globalSettings := &policies.GlobalSettings{
 		NginxProxyValid:  true,
 		TelemetryEnabled: true,
@@ -185,6 +186,7 @@ func TestValidator_Validate(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			conds := v.Validate(test.policy, test.globalSettings)
@@ -194,6 +196,7 @@ func TestValidator_Validate(t *testing.T) {
 }
 
 func TestValidator_ValidatePanics(t *testing.T) {
+	t.Parallel()
 	v := observability.NewValidator(nil)
 
 	validate := func() {
@@ -206,6 +209,7 @@ func TestValidator_ValidatePanics(t *testing.T) {
 }
 
 func TestValidator_Conflicts(t *testing.T) {
+	t.Parallel()
 	tests := []struct {
 		polA      *ngfAPI.ObservabilityPolicy
 		polB      *ngfAPI.ObservabilityPolicy
@@ -244,6 +248,7 @@ func TestValidator_Conflicts(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
 			g := NewWithT(t)
 
 			g.Expect(v.Conflicts(test.polA, test.polB)).To(Equal(test.conflicts))
@@ -252,6 +257,7 @@ func TestValidator_Conflicts(t *testing.T) {
 }
 
 func TestValidator_ConflictsPanics(t *testing.T) {
+	t.Parallel()
 	v := observability.NewValidator(nil)
 
 	conflicts := func() {
diff --git a/internal/mode/static/nginx/config/policies/policies_suite_test.go b/internal/mode/static/nginx/config/policies/policies_suite_test.go
@@ -8,6 +8,7 @@ import (
 )
 
 func TestPolicies(t *testing.T) {
+	t.Parallel()
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Policies Suite")
 }
diff --git a/internal/mode/static/nginx/config/validation/common_test.go b/internal/mode/static/nginx/config/validation/common_test.go
@@ -6,6 +6,7 @@ import (
 )
 
 func TestValidateEscapedString(t *testing.T) {
+	t.Parallel()
 	validator := func(value string) error { return validateEscapedString(value, []string{"example"}) }
 
 	testValidValuesForSimpleValidator(
@@ -25,6 +26,7 @@ func TestValidateEscapedString(t *testing.T) {
 }
 
 func TestValidateEscapedStringNoVarExpansion(t *testing.T) {
+	t.Parallel()
 	validator := func(value string) error { return validateEscapedStringNoVarExpansion(value, []string{"example"}) }
 
 	testValidValuesForSimpleValidator(
@@ -45,6 +47,7 @@ func TestValidateEscapedStringNoVarExpansion(t *testing.T) {
 }
 
 func TestValidateValidHeaderName(t *testing.T) {
+	t.Parallel()
 	validator := func(value string) error { return validateHeaderName(value) }
 
 	testValidValuesForSimpleValidator(
diff --git a/internal/mode/static/nginx/config/validation/framework_test.go b/internal/mode/static/nginx/config/validation/framework_test.go
@@ -79,6 +79,7 @@ func testInvalidValuesForSupportedValuesValidator[T configValue](
 }
 
 func TestValidateInSupportedValues(t *testing.T) {
+	t.Parallel()
 	supportedValues := map[string]struct{}{
 		"value1": {},
 		"value2": {},
@@ -105,6 +106,7 @@ func TestValidateInSupportedValues(t *testing.T) {
 }
 
 func TestValidateNoUnsupportedValues(t *testing.T) {
+	t.Parallel()
 	unsupportedValues := map[string]struct{}{
 		"badvalue1": {},
 		"badvalue2": {},
@@ -133,6 +135,7 @@ func TestValidateNoUnsupportedValues(t *testing.T) {
 }
 
 func TestGetSortedKeysAsString(t *testing.T) {
+	t.Parallel()
 	values := map[string]struct{}{
 		"value3": {},
 		"value1": {},
diff --git a/internal/mode/static/nginx/config/validation/generic_test.go b/internal/mode/static/nginx/config/validation/generic_test.go
@@ -3,6 +3,7 @@ package validation
 import "testing"
 
 func TestGenericValidator_ValidateEscapedStringNoVarExpansion(t *testing.T) {
+	t.Parallel()
 	validator := GenericValidator{}
 
 	testValidValuesForSimpleValidator(
@@ -24,6 +25,7 @@ func TestGenericValidator_ValidateEscapedStringNoVarExpansion(t *testing.T) {
 }
 
 func TestValidateServiceName(t *testing.T) {
+	t.Parallel()
 	validator := GenericValidator{}
 
 	testValidValuesForSimpleValidator(
@@ -45,6 +47,7 @@ func TestValidateServiceName(t *testing.T) {
 }
 
 func TestValidateNginxDuration(t *testing.T) {
+	t.Parallel()
 	validator := GenericValidator{}
 
 	testValidValuesForSimpleValidator(
@@ -65,6 +68,7 @@ func TestValidateNginxDuration(t *testing.T) {
 }
 
 func TestValidateNginxSize(t *testing.T) {
+	t.Parallel()
 	validator := GenericValidator{}
 
 	testValidValuesForSimpleValidator(
@@ -86,6 +90,7 @@ func TestValidateNginxSize(t *testing.T) {
 }
 
 func TestValidateEndpoint(t *testing.T) {
+	t.Parallel()
 	validator := GenericValidator{}
 
 	testValidValuesForSimpleValidator(
diff --git a/internal/mode/static/nginx/config/validation/http_filters_test.go b/internal/mode/static/nginx/config/validation/http_filters_test.go
@@ -6,6 +6,7 @@ import (
 )
 
 func TestValidateRedirectScheme(t *testing.T) {
+	t.Parallel()
 	validator := HTTPRedirectValidator{}
 
 	testValidValuesForSupportedValuesValidator(
@@ -24,6 +25,7 @@ func TestValidateRedirectScheme(t *testing.T) {
 }
 
 func TestValidateRedirectPort(t *testing.T) {
+	t.Parallel()
 	validator := HTTPRedirectValidator{}
 
 	testValidValuesForSimpleValidator(
@@ -35,6 +37,7 @@ func TestValidateRedirectPort(t *testing.T) {
 }
 
 func TestValidateRedirectStatusCode(t *testing.T) {
+	t.Parallel()
 	validator := HTTPRedirectValidator{}
 
 	testValidValuesForSupportedValuesValidator(
@@ -52,6 +55,7 @@ func TestValidateRedirectStatusCode(t *testing.T) {
 }
 
 func TestValidateHostname(t *testing.T) {
+	t.Parallel()
 	validator := HTTPRedirectValidator{}
 
 	testValidValuesForSimpleValidator(
@@ -68,6 +72,7 @@ func TestValidateHostname(t *testing.T) {
 }
 
 func TestValidateRewritePath(t *testing.T) {
+	t.Parallel()
 	validator := HTTPURLRewriteValidator{}
 
 	testValidValuesForSimpleValidator(
@@ -89,6 +94,7 @@ func TestValidateRewritePath(t *testing.T) {
 }
 
 func TestValidateFilterHeaderName(t *testing.T) {
+	t.Parallel()
 	validator := HTTPHeaderValidator{}
 
 	testValidValuesForSimpleValidator(
@@ -102,6 +108,7 @@ func TestValidateFilterHeaderName(t *testing.T) {
 }
 
 func TestValidateFilterHeaderValue(t *testing.T) {
+	t.Parallel()
 	validator := HTTPHeaderValidator{}
 
 	testValidValuesForSimpleValidator(
diff --git a/internal/mode/static/nginx/config/validation/http_njs_match_test.go b/internal/mode/static/nginx/config/validation/http_njs_match_test.go
@@ -5,6 +5,7 @@ import (
 )
 
 func TestValidatePathInMatch(t *testing.T) {
+	t.Parallel()
 	validator := HTTPNJSMatchValidator{}
 
 	testValidValuesForSimpleValidator(
@@ -28,6 +29,7 @@ func TestValidatePathInMatch(t *testing.T) {
 }
 
 func TestValidateHeaderNameInMatch(t *testing.T) {
+	t.Parallel()
 	validator := HTTPNJSMatchValidator{}
 
 	testValidValuesForSimpleValidator(
@@ -50,6 +52,7 @@ func TestValidateHeaderNameInMatch(t *testing.T) {
 }
 
 func TestValidateHeaderValueInMatch(t *testing.T) {
+	t.Parallel()
 	validator := HTTPNJSMatchValidator{}
 
 	testValidValuesForSimpleValidator(
@@ -70,6 +73,7 @@ func TestValidateHeaderValueInMatch(t *testing.T) {
 }
 
 func TestValidateQueryParamNameInMatch(t *testing.T) {
+	t.Parallel()
 	validator := HTTPNJSMatchValidator{}
 
 	testValidValuesForSimpleValidator(
@@ -85,6 +89,7 @@ func TestValidateQueryParamNameInMatch(t *testing.T) {
 }
 
 func TestValidateQueryParamValueInMatch(t *testing.T) {
+	t.Parallel()
 	validator := HTTPNJSMatchValidator{}
 
 	testValidValuesForSimpleValidator(
@@ -100,6 +105,7 @@ func TestValidateQueryParamValueInMatch(t *testing.T) {
 }
 
 func TestValidateMethodInMatch(t *testing.T) {
+	t.Parallel()
 	validator := HTTPNJSMatchValidator{}
 
 	testValidValuesForSupportedValuesValidator(
@@ -123,6 +129,7 @@ func TestValidateMethodInMatch(t *testing.T) {
 }
 
 func TestValidateCommonMatchPart(t *testing.T) {
+	t.Parallel()
 	testValidValuesForSimpleValidator(
 		t,
 		validateCommonNJSMatchPart,

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func TestPolicies(t *testing.T) {`
	`11`	`+ t.Parallel()`
`11`	`12`	`RegisterFailHandler(Fail)`
`12`	`13`	`RunSpecs(t, "Policies Suite")`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`func TestValidateEscapedString(t *testing.T) {`
	`9`	`+ t.Parallel()`
`9`	`10`	`validator := func(value string) error { return validateEscapedString(value, []string{"example"}) }`
`10`	`11`
`11`	`12`	`testValidValuesForSimpleValidator(`
`@@ -25,6 +26,7 @@ func TestValidateEscapedString(t *testing.T) {`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`func TestValidateEscapedStringNoVarExpansion(t *testing.T) {`
	`29`	`+ t.Parallel()`
`28`	`30`	`validator := func(value string) error { return validateEscapedStringNoVarExpansion(value, []string{"example"}) }`
`29`	`31`
`30`	`32`	`testValidValuesForSimpleValidator(`
`@@ -45,6 +47,7 @@ func TestValidateEscapedStringNoVarExpansion(t *testing.T) {`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`func TestValidateValidHeaderName(t *testing.T) {`
	`50`	`+ t.Parallel()`
`48`	`51`	`validator := func(value string) error { return validateHeaderName(value) }`
`49`	`52`
`50`	`53`	`testValidValuesForSimpleValidator(`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ func testInvalidValuesForSupportedValuesValidator[T configValue](`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`func TestValidateInSupportedValues(t *testing.T) {`
	`82`	`+ t.Parallel()`
`82`	`83`	`supportedValues := map[string]struct{}{`
`83`	`84`	`"value1": {},`
`84`	`85`	`"value2": {},`
`@@ -105,6 +106,7 @@ func TestValidateInSupportedValues(t *testing.T) {`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`func TestValidateNoUnsupportedValues(t *testing.T) {`
	`109`	`+ t.Parallel()`
`108`	`110`	`unsupportedValues := map[string]struct{}{`
`109`	`111`	`"badvalue1": {},`
`110`	`112`	`"badvalue2": {},`
`@@ -133,6 +135,7 @@ func TestValidateNoUnsupportedValues(t *testing.T) {`
`133`	`135`	`}`
`134`	`136`
`135`	`137`	`func TestGetSortedKeysAsString(t *testing.T) {`
	`138`	`+ t.Parallel()`
`136`	`139`	`values := map[string]struct{}{`
`137`	`140`	`"value3": {},`
`138`	`141`	`"value1": {},`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`func TestValidateRedirectScheme(t *testing.T) {`
	`9`	`+ t.Parallel()`
`9`	`10`	`validator := HTTPRedirectValidator{}`
`10`	`11`
`11`	`12`	`testValidValuesForSupportedValuesValidator(`
`@@ -24,6 +25,7 @@ func TestValidateRedirectScheme(t *testing.T) {`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`func TestValidateRedirectPort(t *testing.T) {`
	`28`	`+ t.Parallel()`
`27`	`29`	`validator := HTTPRedirectValidator{}`
`28`	`30`
`29`	`31`	`testValidValuesForSimpleValidator(`
`@@ -35,6 +37,7 @@ func TestValidateRedirectPort(t *testing.T) {`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`func TestValidateRedirectStatusCode(t *testing.T) {`
	`40`	`+ t.Parallel()`
`38`	`41`	`validator := HTTPRedirectValidator{}`
`39`	`42`
`40`	`43`	`testValidValuesForSupportedValuesValidator(`
`@@ -52,6 +55,7 @@ func TestValidateRedirectStatusCode(t *testing.T) {`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`func TestValidateHostname(t *testing.T) {`
	`58`	`+ t.Parallel()`
`55`	`59`	`validator := HTTPRedirectValidator{}`
`56`	`60`
`57`	`61`	`testValidValuesForSimpleValidator(`
`@@ -68,6 +72,7 @@ func TestValidateHostname(t *testing.T) {`
`68`	`72`	`}`
`69`	`73`
`70`	`74`	`func TestValidateRewritePath(t *testing.T) {`
	`75`	`+ t.Parallel()`
`71`	`76`	`validator := HTTPURLRewriteValidator{}`
`72`	`77`
`73`	`78`	`testValidValuesForSimpleValidator(`
`@@ -89,6 +94,7 @@ func TestValidateRewritePath(t *testing.T) {`
`89`	`94`	`}`
`90`	`95`
`91`	`96`	`func TestValidateFilterHeaderName(t *testing.T) {`
	`97`	`+ t.Parallel()`
`92`	`98`	`validator := HTTPHeaderValidator{}`
`93`	`99`
`94`	`100`	`testValidValuesForSimpleValidator(`
`@@ -102,6 +108,7 @@ func TestValidateFilterHeaderName(t *testing.T) {`
`102`	`108`	`}`
`103`	`109`
`104`	`110`	`func TestValidateFilterHeaderValue(t *testing.T) {`
	`111`	`+ t.Parallel()`
`105`	`112`	`validator := HTTPHeaderValidator{}`
`106`	`113`
`107`	`114`	`testValidValuesForSimpleValidator(`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`func TestValidatePathInMatch(t *testing.T) {`
	`8`	`+ t.Parallel()`
`8`	`9`	`validator := HTTPNJSMatchValidator{}`
`9`	`10`
`10`	`11`	`testValidValuesForSimpleValidator(`
`@@ -28,6 +29,7 @@ func TestValidatePathInMatch(t *testing.T) {`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`func TestValidateHeaderNameInMatch(t *testing.T) {`
	`32`	`+ t.Parallel()`
`31`	`33`	`validator := HTTPNJSMatchValidator{}`
`32`	`34`
`33`	`35`	`testValidValuesForSimpleValidator(`
`@@ -50,6 +52,7 @@ func TestValidateHeaderNameInMatch(t *testing.T) {`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`func TestValidateHeaderValueInMatch(t *testing.T) {`
	`55`	`+ t.Parallel()`
`53`	`56`	`validator := HTTPNJSMatchValidator{}`
`54`	`57`
`55`	`58`	`testValidValuesForSimpleValidator(`
`@@ -70,6 +73,7 @@ func TestValidateHeaderValueInMatch(t *testing.T) {`
`70`	`73`	`}`
`71`	`74`
`72`	`75`	`func TestValidateQueryParamNameInMatch(t *testing.T) {`
	`76`	`+ t.Parallel()`
`73`	`77`	`validator := HTTPNJSMatchValidator{}`
`74`	`78`
`75`	`79`	`testValidValuesForSimpleValidator(`
`@@ -85,6 +89,7 @@ func TestValidateQueryParamNameInMatch(t *testing.T) {`
`85`	`89`	`}`
`86`	`90`
`87`	`91`	`func TestValidateQueryParamValueInMatch(t *testing.T) {`
	`92`	`+ t.Parallel()`
`88`	`93`	`validator := HTTPNJSMatchValidator{}`
`89`	`94`
`90`	`95`	`testValidValuesForSimpleValidator(`
`@@ -100,6 +105,7 @@ func TestValidateQueryParamValueInMatch(t *testing.T) {`
`100`	`105`	`}`
`101`	`106`
`102`	`107`	`func TestValidateMethodInMatch(t *testing.T) {`
	`108`	`+ t.Parallel()`
`103`	`109`	`validator := HTTPNJSMatchValidator{}`
`104`	`110`
`105`	`111`	`testValidValuesForSupportedValuesValidator(`
`@@ -123,6 +129,7 @@ func TestValidateMethodInMatch(t *testing.T) {`
`123`	`129`	`}`
`124`	`130`
`125`	`131`	`func TestValidateCommonMatchPart(t *testing.T) {`
	`132`	`+ t.Parallel()`
`126`	`133`	`testValidValuesForSimpleValidator(`
`127`	`134`	`t,`
`128`	`135`	`validateCommonNJSMatchPart,`