diff --git a/internal/controllers/topology/cluster/structuredmerge/drop_diff_test.go b/internal/controllers/topology/cluster/structuredmerge/drop_diff_test.go index dc77f88b0bcb..566563d39187 100644 --- a/internal/controllers/topology/cluster/structuredmerge/drop_diff_test.go +++ b/internal/controllers/topology/cluster/structuredmerge/drop_diff_test.go @@ -161,7 +161,7 @@ func Test_dropDiffForNotAllowedPaths(t *testing.T) { dropDiff(tt.ctx) - g.Expect(tt.ctx.modified).To(Equal(tt.wantModified)) + g.Expect(tt.ctx.modified).To(BeComparableTo(tt.wantModified)) }) } } @@ -268,7 +268,7 @@ func Test_dropDiffForIgnoredPaths(t *testing.T) { dropDiff(tt.ctx) - g.Expect(tt.ctx.modified).To(Equal(tt.wantModified)) + g.Expect(tt.ctx.modified).To(BeComparableTo(tt.wantModified)) }) } } diff --git a/internal/controllers/topology/cluster/structuredmerge/serversidepathhelper_test.go b/internal/controllers/topology/cluster/structuredmerge/serversidepathhelper_test.go index e04cdf709671..c0d5e85a96c8 100644 --- a/internal/controllers/topology/cluster/structuredmerge/serversidepathhelper_test.go +++ b/internal/controllers/topology/cluster/structuredmerge/serversidepathhelper_test.go @@ -675,7 +675,7 @@ func TestServerSideApplyWithDefaulting(t *testing.T) { // Ensure patchKCT was defaulted. g.Expect(env.Get(ctx, client.ObjectKeyFromObject(kct), patchKCT)).To(Succeed()) - g.Expect(patchKCT.Spec.Template.Spec.Users).To(Equal([]bootstrapv1.User{{Name: "default-user"}})) + g.Expect(patchKCT.Spec.Template.Spec.Users).To(BeComparableTo([]bootstrapv1.User{{Name: "default-user"}})) }, 5*time.Second).Should(Succeed()) } // Get original for the update. diff --git a/internal/topology/variables/cluster_variable_defaulting_test.go b/internal/topology/variables/cluster_variable_defaulting_test.go index 57ed0c356e1f..f441264e6bd2 100644 --- a/internal/topology/variables/cluster_variable_defaulting_test.go +++ b/internal/topology/variables/cluster_variable_defaulting_test.go @@ -656,7 +656,7 @@ func Test_DefaultClusterVariables(t *testing.T) { return } g.Expect(errList).To(BeEmpty()) - g.Expect(vars).To(Equal(tt.want)) + g.Expect(vars).To(BeComparableTo(tt.want)) }) } } @@ -1195,7 +1195,7 @@ func Test_DefaultClusterVariable(t *testing.T) { } g.Expect(errList).To(BeEmpty()) - g.Expect(defaultedVariable).To(Equal(tt.want)) + g.Expect(defaultedVariable).To(BeComparableTo(tt.want)) }) } } @@ -1337,6 +1337,6 @@ func Test_getAllVariables(t *testing.T) { valuesIndex, err := newValuesIndex(values) g.Expect(err).ToNot(HaveOccurred()) got := getAllVariables(values, valuesIndex, definitions) - g.Expect(got).To(Equal(expectedValues)) + g.Expect(got).To(BeComparableTo(expectedValues)) }) } diff --git a/internal/util/ssa/filterintent_test.go b/internal/util/ssa/filterintent_test.go index 1487e85ce5c1..820047e1f82e 100644 --- a/internal/util/ssa/filterintent_test.go +++ b/internal/util/ssa/filterintent_test.go @@ -111,7 +111,7 @@ func Test_filterNotAllowedPaths(t *testing.T) { FilterIntent(tt.ctx) - g.Expect(tt.ctx.Value).To(Equal(tt.wantValue)) + g.Expect(tt.ctx.Value).To(BeComparableTo(tt.wantValue)) }) } } @@ -195,7 +195,7 @@ func Test_filterIgnoredPaths(t *testing.T) { FilterIntent(tt.ctx) - g.Expect(tt.ctx.Value).To(Equal(tt.wantValue)) + g.Expect(tt.ctx.Value).To(BeComparableTo(tt.wantValue)) }) } } diff --git a/internal/util/taints/taints_test.go b/internal/util/taints/taints_test.go index 2777a79e30dd..2b6e3f766cb4 100644 --- a/internal/util/taints/taints_test.go +++ b/internal/util/taints/taints_test.go @@ -72,7 +72,7 @@ func TestRemoveNodeTaint(t *testing.T) { g := NewWithT(t) got := RemoveNodeTaint(tt.node, tt.dropTaint) g.Expect(got).To(Equal(tt.wantModified)) - g.Expect(tt.node.Spec.Taints).To(Equal(tt.wantTaints)) + g.Expect(tt.node.Spec.Taints).To(BeComparableTo(tt.wantTaints)) }) } } diff --git a/internal/webhooks/runtime/extensionconfig_webhook_test.go b/internal/webhooks/runtime/extensionconfig_webhook_test.go index b6fbd0afefb6..2905fefb5574 100644 --- a/internal/webhooks/runtime/extensionconfig_webhook_test.go +++ b/internal/webhooks/runtime/extensionconfig_webhook_test.go @@ -129,8 +129,8 @@ func TestExtensionConfigDefault(t *testing.T) { t.Run("for Extension", util.CustomDefaultValidateTest(ctx, extensionConfig, extensionConfigWebhook)) g.Expect(extensionConfigWebhook.Default(ctx, extensionConfig)).To(Succeed()) - g.Expect(extensionConfig.Spec.NamespaceSelector).To(Equal(&metav1.LabelSelector{})) - g.Expect(extensionConfig.Spec.ClientConfig.Service.Port).To(Equal(pointer.Int32(443))) + g.Expect(extensionConfig.Spec.NamespaceSelector).To(BeComparableTo(&metav1.LabelSelector{})) + g.Expect(extensionConfig.Spec.ClientConfig.Service.Port).To(BeComparableTo(pointer.Int32(443))) } func TestExtensionConfigValidate(t *testing.T) { diff --git a/test/e2e/clusterclass_changes.go b/test/e2e/clusterclass_changes.go index a0cad1b83227..d9a309a3c3f1 100644 --- a/test/e2e/clusterclass_changes.go +++ b/test/e2e/clusterclass_changes.go @@ -456,7 +456,7 @@ func assertMachineDeploymentTopologyFields(g Gomega, md clusterv1.MachineDeploym } if mdTopology.Strategy != nil { - g.Expect(md.Spec.Strategy).To(Equal(mdTopology.Strategy)) + g.Expect(md.Spec.Strategy).To(BeComparableTo(mdTopology.Strategy)) } if mdTopology.FailureDomain != nil { diff --git a/test/extension/handlers/topologymutation/handler_test.go b/test/extension/handlers/topologymutation/handler_test.go index 7d84842680f4..e843adbfbd9c 100644 --- a/test/extension/handlers/topologymutation/handler_test.go +++ b/test/extension/handlers/topologymutation/handler_test.go @@ -92,7 +92,7 @@ func Test_patchDockerClusterTemplate(t *testing.T) { } else { g.Expect(err).ToNot(HaveOccurred()) } - g.Expect(tt.template).To(Equal(tt.expectedTemplate)) + g.Expect(tt.template).To(BeComparableTo(tt.expectedTemplate)) }) } } @@ -189,7 +189,7 @@ func Test_patchKubeadmControlPlaneTemplate(t *testing.T) { } else { g.Expect(err).ToNot(HaveOccurred()) } - g.Expect(tt.template).To(Equal(tt.expectedTemplate)) + g.Expect(tt.template).To(BeComparableTo(tt.expectedTemplate)) }) } } @@ -283,7 +283,7 @@ func Test_patchKubeadmConfigTemplate(t *testing.T) { } else { g.Expect(err).ToNot(HaveOccurred()) } - g.Expect(tt.template).To(Equal(tt.expectedTemplate)) + g.Expect(tt.template).To(BeComparableTo(tt.expectedTemplate)) }) } } @@ -334,7 +334,7 @@ func Test_patchDockerMachineTemplate(t *testing.T) { } else { g.Expect(err).ToNot(HaveOccurred()) } - g.Expect(tt.template).To(Equal(tt.expectedTemplate)) + g.Expect(tt.template).To(BeComparableTo(tt.expectedTemplate)) }) } } diff --git a/test/framework/machinedeployment_helpers.go b/test/framework/machinedeployment_helpers.go index 5596d128d917..e39312f8441c 100644 --- a/test/framework/machinedeployment_helpers.go +++ b/test/framework/machinedeployment_helpers.go @@ -325,7 +325,7 @@ func UpgradeMachineDeploymentInfrastructureRefAndWait(ctx context.Context, input g.Expect(*newMachineSet.Spec.Replicas).To(Equal(newMachineSet.Status.AvailableReplicas)) // MachineSet should have the same infrastructureRef as the MachineDeployment. - g.Expect(newMachineSet.Spec.Template.Spec.InfrastructureRef).To(Equal(deployment.Spec.Template.Spec.InfrastructureRef)) + g.Expect(newMachineSet.Spec.Template.Spec.InfrastructureRef).To(BeComparableTo(deployment.Spec.Template.Spec.InfrastructureRef)) }, input.WaitForMachinesToBeUpgraded...).Should(Succeed()) } } diff --git a/test/infrastructure/docker/internal/provisioning/cloudinit/runcmd_test.go b/test/infrastructure/docker/internal/provisioning/cloudinit/runcmd_test.go index 3050b9ec51d8..039dbffc3be3 100644 --- a/test/infrastructure/docker/internal/provisioning/cloudinit/runcmd_test.go +++ b/test/infrastructure/docker/internal/provisioning/cloudinit/runcmd_test.go @@ -38,10 +38,10 @@ runcmd: g.Expect(r.Cmds).To(HaveLen(2)) expected0 := provisioning.Cmd{Cmd: "ls", Args: []string{"-l", "/"}} - g.Expect(r.Cmds[0]).To(Equal(expected0)) + g.Expect(r.Cmds[0]).To(BeComparableTo(expected0)) expected1 := provisioning.Cmd{Cmd: "/bin/sh", Args: []string{"-c", "ls -l /"}} - g.Expect(r.Cmds[1]).To(Equal(expected1)) + g.Expect(r.Cmds[1]).To(BeComparableTo(expected1)) } func TestRunCmdRun(t *testing.T) { @@ -82,7 +82,7 @@ func TestRunCmdRun(t *testing.T) { commands, err := rt.r.Commands() g.Expect(err).ToNot(HaveOccurred()) - g.Expect(rt.expectedCmds).To(Equal(commands)) + g.Expect(rt.expectedCmds).To(BeComparableTo(commands)) }) } } @@ -102,10 +102,10 @@ runcmd: r.Cmds[0] = hackKubeadmIgnoreErrors(r.Cmds[0]) expected0 := provisioning.Cmd{Cmd: "/bin/sh", Args: []string{"-c", "kubeadm init --ignore-preflight-errors=SystemVerification,Swap,FileContent--proc-sys-net-bridge-bridge-nf-call-iptables --config=/run/kubeadm/kubeadm.yaml"}} - g.Expect(r.Cmds[0]).To(Equal(expected0)) + g.Expect(r.Cmds[0]).To(BeComparableTo(expected0)) r.Cmds[1] = hackKubeadmIgnoreErrors(r.Cmds[1]) expected1 := provisioning.Cmd{Cmd: "kubeadm", Args: []string{"join", "--ignore-preflight-errors=SystemVerification,Swap,FileContent--proc-sys-net-bridge-bridge-nf-call-iptables", "--config=/run/kubeadm/kubeadm-controlplane-join-config.yaml"}} - g.Expect(r.Cmds[1]).To(Equal(expected1)) + g.Expect(r.Cmds[1]).To(BeComparableTo(expected1)) } diff --git a/test/infrastructure/docker/internal/provisioning/cloudinit/writefiles_test.go b/test/infrastructure/docker/internal/provisioning/cloudinit/writefiles_test.go index 28077c652953..28b7ef7964e8 100644 --- a/test/infrastructure/docker/internal/provisioning/cloudinit/writefiles_test.go +++ b/test/infrastructure/docker/internal/provisioning/cloudinit/writefiles_test.go @@ -96,7 +96,7 @@ func TestWriteFiles(t *testing.T) { cmds, err := rt.w.Commands() g.Expect(err).ToNot(HaveOccurred()) - g.Expect(rt.expectedCmds).To(Equal(cmds)) + g.Expect(rt.expectedCmds).To(BeComparableTo(cmds)) }) } } diff --git a/test/infrastructure/inmemory/internal/cloud/runtime/cache/client_test.go b/test/infrastructure/inmemory/internal/cloud/runtime/cache/client_test.go index 5508f644b128..24416549b5c1 100644 --- a/test/infrastructure/inmemory/internal/cloud/runtime/cache/client_test.go +++ b/test/infrastructure/inmemory/internal/cloud/runtime/cache/client_test.go @@ -102,7 +102,7 @@ func Test_cache_client(t *testing.T) { g.Expect(c.resourceGroups["foo"].objects[cloudv1.GroupVersion.WithKind(cloudv1.CloudMachineKind)]).To(HaveKey(key), "Object bar must exists in object tracker for foo") r := c.resourceGroups["foo"].objects[cloudv1.GroupVersion.WithKind(cloudv1.CloudMachineKind)][key] - g.Expect(r.GetObjectKind().GroupVersionKind()).To(Equal(cloudv1.GroupVersion.WithKind(cloudv1.CloudMachineKind)), "gvk must be set") + g.Expect(r.GetObjectKind().GroupVersionKind()).To(BeComparableTo(cloudv1.GroupVersion.WithKind(cloudv1.CloudMachineKind)), "gvk must be set") g.Expect(r.GetName()).To(Equal("bar"), "name must be equal to object tracker key") g.Expect(r.GetResourceVersion()).To(Equal("v1"), "resourceVersion must be set") g.Expect(r.GetCreationTimestamp()).ToNot(BeZero(), "creation timestamp must be set") @@ -269,7 +269,7 @@ func Test_cache_client(t *testing.T) { g.Expect(err).ToNot(HaveOccurred()) // Check all the computed fields are as expected. - g.Expect(obj.GetObjectKind().GroupVersionKind()).To(Equal(cloudv1.GroupVersion.WithKind(cloudv1.CloudMachineKind)), "gvk must be set") + g.Expect(obj.GetObjectKind().GroupVersionKind()).To(BeComparableTo(cloudv1.GroupVersion.WithKind(cloudv1.CloudMachineKind)), "gvk must be set") g.Expect(obj.GetName()).To(Equal("bar"), "name must be equal to object tracker key") g.Expect(obj.GetResourceVersion()).To(Equal("v1"), "resourceVersion must be set") g.Expect(obj.GetCreationTimestamp()).ToNot(BeZero(), "creation timestamp must be set") @@ -412,7 +412,7 @@ func Test_cache_client(t *testing.T) { err = c.Update("foo", objUpdate) g.Expect(err).ToNot(HaveOccurred()) - g.Expect(objBefore).To(Equal(objUpdate), "obj before and after must be the same") + g.Expect(objBefore).To(BeComparableTo(objUpdate), "obj before and after must be the same") g.Expect(h.Events()).ToNot(ContainElement("foo, CloudMachine=bar, Updated")) }) @@ -435,7 +435,7 @@ func Test_cache_client(t *testing.T) { g.Expect(objBefore.GetResourceVersion()).ToNot(Equal(objUpdate.GetResourceVersion()), "Object version must be changed") objBefore.SetResourceVersion(objUpdate.GetResourceVersion()) objBefore.Labels = objUpdate.Labels - g.Expect(objBefore).To(Equal(objUpdate), "everything else must be the same") + g.Expect(objBefore).To(BeComparableTo(objUpdate), "everything else must be the same") g.Expect(h.Events()).To(ContainElement("foo, CloudMachine=baz, Updated")) }) @@ -670,7 +670,7 @@ func Test_cache_client(t *testing.T) { g.Expect(objBefore.GetResourceVersion()).ToNot(Equal(objAfterUpdate.GetResourceVersion()), "Object version must be changed") objBefore.SetResourceVersion(objAfterUpdate.GetResourceVersion()) objBefore.Labels = objAfterUpdate.Labels - g.Expect(objBefore).To(Equal(objAfterUpdate), "everything else must be the same") + g.Expect(objBefore).To(BeComparableTo(objAfterUpdate), "everything else must be the same") g.Expect(h.Events()).To(ContainElement("foo, CloudMachine=baz, Deleted")) diff --git a/test/infrastructure/inmemory/internal/server/mux_test.go b/test/infrastructure/inmemory/internal/server/mux_test.go index 7072df7a9518..ff5c60c9daef 100644 --- a/test/infrastructure/inmemory/internal/server/mux_test.go +++ b/test/infrastructure/inmemory/internal/server/mux_test.go @@ -188,7 +188,7 @@ func TestAPI_corev1_CRUD(t *testing.T) { node := &corev1.Node{} g.Expect(c.Get(ctx, client.ObjectKeyFromObject(n3), node)).To(Succeed()) - g.Expect(node.Spec.Taints).To(Equal(taints)) + g.Expect(node.Spec.Taints).To(BeComparableTo(taints)) // delete diff --git a/test/infrastructure/kind/mapper_test.go b/test/infrastructure/kind/mapper_test.go index 42bf2556d3d2..d95246b18e2b 100644 --- a/test/infrastructure/kind/mapper_test.go +++ b/test/infrastructure/kind/mapper_test.go @@ -115,7 +115,7 @@ func TestGetMapping(t *testing.T) { got := GetMapping(tc.k8sVersion, tc.customImage) tc.expectedMapping.KubernetesVersion = tc.k8sVersion - g.Expect(got).To(Equal(tc.expectedMapping)) + g.Expect(got).To(BeComparableTo(tc.expectedMapping)) }) } } diff --git a/util/conditions/patch_test.go b/util/conditions/patch_test.go index 968d605ff2b0..eda543bef3ef 100644 --- a/util/conditions/patch_test.go +++ b/util/conditions/patch_test.go @@ -124,7 +124,7 @@ func TestNewPatch(t *testing.T) { return } g.Expect(err).To(Not(HaveOccurred())) - g.Expect(got).To(Equal(tt.want)) + g.Expect(got).To(BeComparableTo(tt.want)) }) } } @@ -337,5 +337,5 @@ func TestApplyDoesNotAlterLastTransitionTime(t *testing.T) { err = diff.Apply(latest) g.Expect(err).ToNot(HaveOccurred()) - g.Expect(latest.GetConditions()).To(Equal(after.GetConditions())) + g.Expect(latest.GetConditions()).To(BeComparableTo(after.GetConditions())) } diff --git a/util/conditions/unstructured_test.go b/util/conditions/unstructured_test.go index 578fd63b313b..acaca1230475 100644 --- a/util/conditions/unstructured_test.go +++ b/util/conditions/unstructured_test.go @@ -84,5 +84,5 @@ func TestUnstructuredSetConditions(t *testing.T) { s := UnstructuredSetter(u) s.SetConditions(conditions) - g.Expect(s.GetConditions()).To(Equal(conditions)) + g.Expect(s.GetConditions()).To(BeComparableTo(conditions)) } diff --git a/util/kubeconfig/kubeconfig_test.go b/util/kubeconfig/kubeconfig_test.go index e65fa51ec3e6..320b01f57ca4 100644 --- a/util/kubeconfig/kubeconfig_test.go +++ b/util/kubeconfig/kubeconfig_test.go @@ -173,7 +173,7 @@ func TestNew(t *testing.T) { g.Expect(actualConfig.Clusters[tc.cluster]).NotTo(BeNil()) g.Expect(actualConfig.Contexts[tc.expectedConfig.CurrentContext]).NotTo(BeNil()) g.Expect(actualConfig.CurrentContext).To(Equal(tc.expectedConfig.CurrentContext)) - g.Expect(actualConfig.Contexts).To(Equal(tc.expectedConfig.Contexts)) + g.Expect(actualConfig.Contexts).To(BeComparableTo(tc.expectedConfig.Contexts)) } } @@ -199,7 +199,7 @@ func TestGenerateSecretWithOwner(t *testing.T) { ) g.Expect(kubeconfigSecret).NotTo(BeNil()) - g.Expect(kubeconfigSecret).To(Equal(expectedSecret)) + g.Expect(kubeconfigSecret).To(BeComparableTo(expectedSecret)) } func TestGenerateSecret(t *testing.T) { diff --git a/util/util_test.go b/util/util_test.go index c736c02b6eb1..c8be05058197 100644 --- a/util/util_test.go +++ b/util/util_test.go @@ -104,7 +104,7 @@ func TestMachineToInfrastructureMapFunc(t *testing.T) { t.Run(tc.name, func(t *testing.T) { fn := MachineToInfrastructureMapFunc(tc.input) out := fn(ctx, tc.request) - g.Expect(out).To(Equal(tc.output)) + g.Expect(out).To(BeComparableTo(tc.output)) }) } } @@ -226,7 +226,7 @@ func TestClusterToInfrastructureMapFunc(t *testing.T) { fn := ClusterToInfrastructureMapFunc(context.Background(), tc.input, clientBuilder.Build(), referenceObject) out := fn(ctx, tc.request) - g.Expect(out).To(Equal(tc.output)) + g.Expect(out).To(BeComparableTo(tc.output)) }) } } diff --git a/util/version/version_test.go b/util/version/version_test.go index a76ea9d2c7e5..4e8cb9ed4409 100644 --- a/util/version/version_test.go +++ b/util/version/version_test.go @@ -71,7 +71,7 @@ func TestParseMajorMinorPatch(t *testing.T) { t.Run(tc.name, func(t *testing.T) { out, err := ParseMajorMinorPatch(tc.input) g.Expect(err != nil).To(Equal(tc.expectError)) - g.Expect(out).To(Equal(tc.output)) + g.Expect(out).To(BeComparableTo(tc.output)) }) } } @@ -119,7 +119,7 @@ func TestParseMajorMinorPatchTolerant(t *testing.T) { t.Run(tc.name, func(t *testing.T) { out, err := ParseMajorMinorPatchTolerant(tc.input) g.Expect(err != nil).To(Equal(tc.expectError)) - g.Expect(out).To(Equal(tc.output)) + g.Expect(out).To(BeComparableTo(tc.output)) }) } }