Merge pull request #1777 from karuppiah7890/fix-1760

Capture test case range variable before running sub test in parallel
kubernetes-sigs · Oct 25, 2021 · 5bdf09c · 5bdf09c
2 parents 0d6e843 + 4ffc946
commit 5bdf09c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/api/v1beta1/azurecluster_webhook_test.go b/api/v1beta1/azurecluster_webhook_test.go
@@ -107,13 +107,21 @@ func TestAzureCluster_ValidateUpdate(t *testing.T) {
 	}{
 		{
 			name: "azurecluster with pre-existing vnet - valid spec",
+			oldCluster: func() *AzureCluster {
+				return createValidCluster()
+			}(),
 			cluster: func() *AzureCluster {
 				return createValidCluster()
 			}(),
 			wantErr: false,
 		},
 		{
 			name: "azurecluster without pre-existing vnet - valid spec",
+			oldCluster: func() *AzureCluster {
+				cluster := createValidCluster()
+				cluster.Spec.NetworkSpec.Vnet.ResourceGroup = ""
+				return cluster
+			}(),
 			cluster: func() *AzureCluster {
 				cluster := createValidCluster()
 				cluster.Spec.NetworkSpec.Vnet.ResourceGroup = ""
@@ -123,6 +131,9 @@ func TestAzureCluster_ValidateUpdate(t *testing.T) {
 		},
 		{
 			name: "azurecluster with pre-existing vnet - lack control plane subnet",
+			oldCluster: func() *AzureCluster {
+				return createValidCluster()
+			}(),
 			cluster: func() *AzureCluster {
 				cluster := createValidCluster()
 				cluster.Spec.NetworkSpec.Subnets = cluster.Spec.NetworkSpec.Subnets[1:]
@@ -132,6 +143,9 @@ func TestAzureCluster_ValidateUpdate(t *testing.T) {
 		},
 		{
 			name: "azurecluster with pre-existing vnet - lack node subnet",
+			oldCluster: func() *AzureCluster {
+				return createValidCluster()
+			}(),
 			cluster: func() *AzureCluster {
 				cluster := createValidCluster()
 				cluster.Spec.NetworkSpec.Subnets = cluster.Spec.NetworkSpec.Subnets[:1]
@@ -141,6 +155,9 @@ func TestAzureCluster_ValidateUpdate(t *testing.T) {
 		},
 		{
 			name: "azurecluster with pre-existing vnet - invalid resourcegroup name",
+			oldCluster: func() *AzureCluster {
+				return createValidCluster()
+			}(),
 			cluster: func() *AzureCluster {
 				cluster := createValidCluster()
 				cluster.Spec.NetworkSpec.Vnet.ResourceGroup = "invalid-name###"
@@ -150,6 +167,9 @@ func TestAzureCluster_ValidateUpdate(t *testing.T) {
 		},
 		{
 			name: "azurecluster with pre-existing vnet - invalid subnet name",
+			oldCluster: func() *AzureCluster {
+				return createValidCluster()
+			}(),
 			cluster: func() *AzureCluster {
 				cluster := createValidCluster()
 				cluster.Spec.NetworkSpec.Subnets = append(cluster.Spec.NetworkSpec.Subnets,
@@ -214,20 +234,6 @@ func TestAzureCluster_ValidateUpdate(t *testing.T) {
 			},
 			wantErr: true,
 		},
-		{
-			name: "azurecluster azureEnvironment is immutable",
-			oldCluster: &AzureCluster{
-				Spec: AzureClusterSpec{
-					AzureEnvironment: "AzureGermanCloud",
-				},
-			},
-			cluster: &AzureCluster{
-				Spec: AzureClusterSpec{
-					AzureEnvironment: "AzureChinaCloud",
-				},
-			},
-			wantErr: true,
-		},
 		{
 			name: "control plane outbound lb is immutable",
 			oldCluster: &AzureCluster{
@@ -248,6 +254,7 @@ func TestAzureCluster_ValidateUpdate(t *testing.T) {
 		},
 	}
 	for _, tc := range tests {
+		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 			err := tc.cluster.ValidateUpdate(tc.oldCluster)

diff --git a/api/v1beta1/azuremachinetemplate_webhook_test.go b/api/v1beta1/azuremachinetemplate_webhook_test.go
@@ -229,6 +229,7 @@ func TestAzureMachineTemplate_ValidateUpdate(t *testing.T) {
 	}
 
 	for _, amt := range tests {
+		amt := amt
 		t.Run(amt.name, func(t *testing.T) {
 			t.Parallel()
 			err := amt.template.ValidateUpdate(amt.oldTemplate)

diff --git a/controllers/azurejson_machine_controller_test.go b/controllers/azurejson_machine_controller_test.go
@@ -69,6 +69,7 @@ func TestUnclonedMachinesPredicate(t *testing.T) {
 	}
 
 	for name, tc := range cases {
+		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			machine := &infrav1.AzureMachine{