Merge pull request #9015 from Dhairya-Arora01/BeComparable

🌱 Replacing gomega.Equal with gomega.BeComparableTo

Author: k8s-ci-robot

bootstrap/kubeadm/api/v1alpha4/kubeadm_types_test.go

@@ -71,7 +71,7 @@ func TestUnmarshalJSON(t *testing.T) {
 			} else {
 				g.Expect(err).ToNot(HaveOccurred())
 			}
-			g.Expect(newbts).To(Equal(rt.bts))
+			g.Expect(newbts).To(BeComparableTo(rt.bts))
 		})
 	}
 }
@@ -182,7 +182,7 @@ func TestNewBootstrapTokenString(t *testing.T) {
 			} else {
 				g.Expect(err).ToNot(HaveOccurred())
 			}
-			g.Expect(actual).To(Equal(rt.bts))
+			g.Expect(actual).To(BeComparableTo(rt.bts))
 		})
 	}
 }

bootstrap/kubeadm/api/v1beta1/kubeadm_types_test.go

@@ -129,7 +129,7 @@ func TestBootstrapTokenStringUnmarshalJSON(t *testing.T) {
 			} else {
 				g.Expect(err).ToNot(HaveOccurred())
 			}
-			g.Expect(newbts).To(Equal(rt.bts))
+			g.Expect(newbts).To(BeComparableTo(rt.bts))
 		})
 	}
 }
@@ -240,7 +240,7 @@ func TestNewBootstrapTokenString(t *testing.T) {
 			} else {
 				g.Expect(err).ToNot(HaveOccurred())
 			}
-			g.Expect(actual).To(Equal(rt.bts))
+			g.Expect(actual).To(BeComparableTo(rt.bts))
 		})
 	}
 }

bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_test.go

@@ -338,7 +338,7 @@ func TestKubeadmConfigReconciler_ReturnEarlyIfClusterInfraNotReady(t *testing.T)
 
 	expectedResult := reconcile.Result{}
 	actualResult, actualError := k.Reconcile(ctx, request)
-	g.Expect(actualResult).To(Equal(expectedResult))
+	g.Expect(actualResult).To(BeComparableTo(expectedResult))
 	g.Expect(actualError).ToNot(HaveOccurred())
 	assertHasFalseCondition(g, myclient, request, bootstrapv1.DataSecretAvailableCondition, clusterv1.ConditionSeverityInfo, bootstrapv1.WaitingForClusterInfrastructureReason)
 }
@@ -1566,7 +1566,7 @@ func TestKubeadmConfigReconciler_Reconcile_DiscoveryReconcileFailureBehaviors(t
 			g := NewWithT(t)
 
 			res, err := k.reconcileDiscovery(ctx, tc.cluster, tc.config, secret.Certificates{})
-			g.Expect(res).To(Equal(tc.result))
+			g.Expect(res).To(BeComparableTo(tc.result))
 			if tc.err == nil {
 				g.Expect(err).ToNot(HaveOccurred())
 			} else {
@@ -2084,7 +2084,7 @@ func TestKubeadmConfigReconciler_ResolveFiles(t *testing.T) {
 
 			files, err := k.resolveFiles(ctx, tc.cfg)
 			g.Expect(err).ToNot(HaveOccurred())
-			g.Expect(files).To(Equal(tc.expect))
+			g.Expect(files).To(BeComparableTo(tc.expect))
 			for _, file := range tc.cfg.Spec.Files {
 				if contentFrom[file.Path] {
 					g.Expect(file.ContentFrom).NotTo(BeNil())
@@ -2211,7 +2211,7 @@ func TestKubeadmConfigReconciler_ResolveUsers(t *testing.T) {
 
 			users, err := k.resolveUsers(ctx, tc.cfg)
 			g.Expect(err).ToNot(HaveOccurred())
-			g.Expect(users).To(Equal(tc.expect))
+			g.Expect(users).To(BeComparableTo(tc.expect))
 			for _, user := range tc.cfg.Spec.Users {
 				if passwdFrom[user.Name] {
 					g.Expect(user.PasswdFrom).NotTo(BeNil())

bootstrap/kubeadm/types/upstreamv1beta1/bootstraptokenstring_test.go

@@ -71,7 +71,7 @@ func TestUnmarshalJSON(t *testing.T) {
 			} else {
 				g.Expect(err).ToNot(HaveOccurred())
 			}
-			g.Expect(newbts).To(Equal(rt.bts))
+			g.Expect(newbts).To(BeComparableTo(rt.bts))
 		})
 	}
 }
@@ -182,7 +182,7 @@ func TestNewBootstrapTokenString(t *testing.T) {
 			} else {
 				g.Expect(err).ToNot(HaveOccurred())
 			}
-			g.Expect(actual).To(Equal(rt.bts))
+			g.Expect(actual).To(BeComparableTo(rt.bts))
 		})
 	}
 }
@@ -217,7 +217,7 @@ func TestNewBootstrapTokenStringFromIDAndSecret(t *testing.T) {
 			} else {
 				g.Expect(err).ToNot(HaveOccurred())
 			}
-			g.Expect(actual).To(Equal(rt.bts))
+			g.Expect(actual).To(BeComparableTo(rt.bts))
 		})
 	}
 }

bootstrap/kubeadm/types/upstreamv1beta2/bootstraptokenstring_test.go

@@ -71,7 +71,7 @@ func TestUnmarshalJSON(t *testing.T) {
 			} else {
 				g.Expect(err).ToNot(HaveOccurred())
 			}
-			g.Expect(newbts).To(Equal(rt.bts))
+			g.Expect(newbts).To(BeComparableTo(rt.bts))
 		})
 	}
 }
@@ -182,7 +182,7 @@ func TestNewBootstrapTokenString(t *testing.T) {
 			} else {
 				g.Expect(err).ToNot(HaveOccurred())
 			}
-			g.Expect(actual).To(Equal(rt.bts))
+			g.Expect(actual).To(BeComparableTo(rt.bts))
 		})
 	}
 }
@@ -217,7 +217,7 @@ func TestNewBootstrapTokenStringFromIDAndSecret(t *testing.T) {
 			} else {
 				g.Expect(err).ToNot(HaveOccurred())
 			}
-			g.Expect(actual).To(Equal(rt.bts))
+			g.Expect(actual).To(BeComparableTo(rt.bts))
 		})
 	}
 }

bootstrap/kubeadm/types/utils_test.go

@@ -139,7 +139,7 @@ func TestKubeVersionToKubeadmAPIGroupVersion(t *testing.T) {
 				return
 			}
 			g.Expect(err).ToNot(HaveOccurred())
-			g.Expect(got).To(Equal(tt.want))
+			g.Expect(got).To(BeComparableTo(tt.want))
 		})
 	}
 }
@@ -496,7 +496,7 @@ func TestUnmarshalClusterConfiguration(t *testing.T) {
 				return
 			}
 			g.Expect(err).ToNot(HaveOccurred())
-			g.Expect(got).To(Equal(tt.want), cmp.Diff(tt.want, got))
+			g.Expect(got).To(BeComparableTo(tt.want), cmp.Diff(tt.want, got))
 		})
 	}
 }
@@ -551,7 +551,7 @@ func TestUnmarshalClusterStatus(t *testing.T) {
 				return
 			}
 			g.Expect(err).ToNot(HaveOccurred())
-			g.Expect(got).To(Equal(tt.want), cmp.Diff(tt.want, got))
+			g.Expect(got).To(BeComparableTo(tt.want), cmp.Diff(tt.want, got))
 		})
 	}
 }
@@ -610,7 +610,7 @@ func TestUnmarshalInitConfiguration(t *testing.T) {
 				return
 			}
 			g.Expect(err).ToNot(HaveOccurred())
-			g.Expect(got).To(Equal(tt.want), cmp.Diff(tt.want, got))
+			g.Expect(got).To(BeComparableTo(tt.want), cmp.Diff(tt.want, got))
 		})
 	}
 }
@@ -669,7 +669,7 @@ func TestUnmarshalJoinConfiguration(t *testing.T) {
 				return
 			}
 			g.Expect(err).ToNot(HaveOccurred())
-			g.Expect(got).To(Equal(tt.want), cmp.Diff(tt.want, got))
+			g.Expect(got).To(BeComparableTo(tt.want), cmp.Diff(tt.want, got))
 		})
 	}
 }

cmd/clusterctl/api/v1alpha3/metadata_type_test.go

@@ -65,7 +65,7 @@ func TestGetReleaseSeriesForContract(t *testing.T) {
 			g := NewWithT(t)
 
 			m := &Metadata{ReleaseSeries: test.releaseSeries}
-			g.Expect(m.GetReleaseSeriesForContract(test.contract)).To(Equal(test.expectedReleaseSeries))
+			g.Expect(m.GetReleaseSeriesForContract(test.contract)).To(BeComparableTo(test.expectedReleaseSeries))
 		})
 	}
 }

cmd/clusterctl/client/cluster/cert_manager_test.go

@@ -715,7 +715,7 @@ func Test_certManagerClient_PlanUpgrade(t *testing.T) {
 			actualPlan, err := cm.PlanUpgrade()
 			if tt.expectErr {
 				g.Expect(err).To(HaveOccurred())
-				g.Expect(actualPlan).To(Equal(CertManagerUpgradePlan{}))
+				g.Expect(actualPlan).To(BeComparableTo(CertManagerUpgradePlan{}))
 				return
 			}
 			g.Expect(err).ToNot(HaveOccurred())

cmd/clusterctl/client/cluster/mover_test.go

@@ -912,7 +912,7 @@ func Test_objectMover_restoreTargetObject(t *testing.T) {
 				g.Expect(oAfter.GetName()).Should(Equal(oTo.GetName()))
 				g.Expect(oAfter.GetCreationTimestamp()).Should(Equal(oTo.GetCreationTimestamp()))
 				g.Expect(oAfter.GetUID()).Should(Equal(oTo.GetUID()))
-				g.Expect(oAfter.GetOwnerReferences()).Should(Equal(oTo.GetOwnerReferences()))
+				g.Expect(oAfter.GetOwnerReferences()).Should(BeComparableTo(oTo.GetOwnerReferences()))
 			}
 		})
 	}

cmd/clusterctl/client/cluster/topology_test.go

@@ -300,7 +300,7 @@ func Test_topologyClient_Plan(t *testing.T) {
 				g.Expect(res.ReconciledCluster).To(BeNil())
 			} else {
 				g.Expect(res.ReconciledCluster).NotTo(BeNil())
-				g.Expect(*res.ReconciledCluster).To(Equal(*tt.want.reconciledCluster))
+				g.Expect(*res.ReconciledCluster).To(BeComparableTo(*tt.want.reconciledCluster))
 			}
 
 			// Check the created objects.