Attempt#1 at fixing tests

Signed-off-by: Parthvi Vala <[email protected]>

Author: valaparthvi

hosted/aks/p1/p1_provisioning_test.go

@@ -187,7 +187,7 @@ var _ = Describe("P1Provisioning", func() {
 		initialNPCount := len(*cluster.AKSConfig.NodePools)
 		cluster, err = helper.AddNodePool(cluster, 3, ctx.RancherAdminClient, false, false)
 		Expect(err).To(BeNil())
-		Expect(cluster.AKSConfig.NodePools).To(HaveLen(initialNPCount + 3))
+		Expect(*cluster.AKSConfig.NodePools).To(HaveLen(initialNPCount + 3))
 
 		var upgradeK8sVersion string
 		upgradeK8sVersion, err = helper.GetK8sVersion(ctx.RancherAdminClient, ctx.CloudCredID, location, false)
@@ -208,7 +208,7 @@ var _ = Describe("P1Provisioning", func() {
 
 		cluster, err = ctx.RancherAdminClient.Management.Cluster.ByID(cluster.ID)
 		Expect(err).NotTo(HaveOccurred())
-		Expect(cluster.AKSStatus.UpstreamSpec.NodePools).To(HaveLen(initialNPCount + 3))
+		Expect(*cluster.AKSStatus.UpstreamSpec.NodePools).To(HaveLen(initialNPCount + 3))
 		Expect(cluster.AKSStatus.UpstreamSpec.KubernetesVersion).To(Equal(upgradeK8sVersion))
 	})
 

hosted/aks/p1/p1_suite_test.go

@@ -435,7 +435,7 @@ func syncAddNodePoolFromAzureAndRancher(cluster *management.Cluster, client *ran
 
 		if !helpers.IsImport {
 			// skip this check if the cluster is imported since the AKSConfig value will not be updated
-			Expect(cluster.AKSConfig.NodePools).To(HaveLen(initialNPCount + 1))
+			Expect(*cluster.AKSConfig.NodePools).To(HaveLen(initialNPCount + 1))
 		}
 	})
 
@@ -661,7 +661,7 @@ func azureSyncCheck(cluster *management.Cluster, client *rancher.Client, upgrade
 
 		// Check AKSConfig if the cluster is Rancher-provisioned
 		if !helpers.IsImport {
-			Expect(cluster.AKSConfig.NodePools).To(HaveLen(currentNPCount + 1))
+			Expect(*cluster.AKSConfig.NodePools).To(HaveLen(currentNPCount + 1))
 		}
 	})
 
@@ -710,7 +710,7 @@ func azureSyncCheck(cluster *management.Cluster, client *rancher.Client, upgrade
 
 		// Check AKSConfig if the cluster is Rancher-provisioned
 		if !helpers.IsImport {
-			Expect(cluster.AKSConfig.NodePools).To(HaveLen(currentNPCount))
+			Expect(*cluster.AKSConfig.NodePools).To(HaveLen(currentNPCount))
 		}
 	})
 

hosted/eks/p1/p1_suite_test.go

@@ -414,10 +414,10 @@ func syncAWSToRancherCheck(cluster *management.Cluster, client *rancher.Client,
 			return true
 		}, "10m", "5s").Should(BeTrue(), "Timed out waiting for EKS nodegroup labels to be added")
 
-		configNodeGroups := *cluster.EKSConfig.NodeGroups
 		upstreamNodeGroups = *cluster.EKSStatus.UpstreamSpec.NodeGroups
 		for key, value := range addLabels {
 			if !helpers.IsImport {
+				configNodeGroups := *cluster.EKSConfig.NodeGroups
 				Expect(*configNodeGroups[ngIndex].Labels).To(HaveKeyWithValue(key, value))
 			}
 			Expect(*upstreamNodeGroups[ngIndex].Labels).To(HaveKeyWithValue(key, value))