diff --git a/test/e2e/cloud/gcp/addon_update.go b/test/e2e/cloud/gcp/addon_update.go index a1874fee4a7..ee8d844ac47 100644 --- a/test/e2e/cloud/gcp/addon_update.go +++ b/test/e2e/cloud/gcp/addon_update.go @@ -38,6 +38,7 @@ import ( admissionapi "k8s.io/pod-security-admission/api" "github.com/onsi/ginkgo/v2" + "github.com/onsi/gomega" ) // TODO: it would probably be slightly better to build up the objects @@ -461,7 +462,7 @@ func getMasterSSHClient() (*ssh.Client, error) { func sshExecAndVerify(client *ssh.Client, cmd string) { _, _, rc, err := sshExec(client, cmd) framework.ExpectNoError(err, "Failed to execute %q with ssh client %+v", cmd, client) - framework.ExpectEqual(rc, 0, "error return code from executing command on the cluster: %s", cmd) + gomega.Expect(rc).To(gomega.BeZero(), "error return code from executing command on the cluster: %s", cmd) } func sshExec(client *ssh.Client, cmd string) (string, string, int, error) { diff --git a/test/e2e/cloud/gcp/node_lease.go b/test/e2e/cloud/gcp/node_lease.go index 6fb061a432c..ec75c49371a 100644 --- a/test/e2e/cloud/gcp/node_lease.go +++ b/test/e2e/cloud/gcp/node_lease.go @@ -109,7 +109,7 @@ var _ = SIGDescribe("[Disruptive]NodeLease", func() { ginkgo.By("verify node lease exists for every nodes") originalNodes, err := e2enode.GetReadySchedulableNodes(ctx, c) framework.ExpectNoError(err) - framework.ExpectEqual(len(originalNodes.Items), framework.TestContext.CloudConfig.NumNodes) + gomega.Expect(originalNodes.Items).To(gomega.HaveLen(framework.TestContext.CloudConfig.NumNodes)) gomega.Eventually(ctx, func() error { pass := true @@ -135,7 +135,7 @@ var _ = SIGDescribe("[Disruptive]NodeLease", func() { framework.ExpectNoError(err) targetNodes, err := e2enode.GetReadySchedulableNodes(ctx, c) framework.ExpectNoError(err) - framework.ExpectEqual(len(targetNodes.Items), int(targetNumNodes)) + gomega.Expect(targetNodes.Items).To(gomega.HaveLen(int(targetNumNodes))) ginkgo.By("verify node lease is deleted for the deleted node") var deletedNodeName string diff --git a/test/e2e/cloud/nodes.go b/test/e2e/cloud/nodes.go index 27304c619c8..382182ac398 100644 --- a/test/e2e/cloud/nodes.go +++ b/test/e2e/cloud/nodes.go @@ -30,6 +30,7 @@ import ( admissionapi "k8s.io/pod-security-admission/api" "github.com/onsi/ginkgo/v2" + "github.com/onsi/gomega" ) var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() { @@ -65,8 +66,7 @@ var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() { newNodes, err := e2enode.CheckReady(ctx, c, len(origNodes.Items)-1, 5*time.Minute) framework.ExpectNoError(err) - framework.ExpectEqual(len(newNodes), len(origNodes.Items)-1) - + gomega.Expect(newNodes).To(gomega.HaveLen(len(origNodes.Items) - 1)) _, err = c.CoreV1().Nodes().Get(ctx, nodeToDelete.Name, metav1.GetOptions{}) if err == nil { framework.Failf("node %q still exists when it should be deleted", nodeToDelete.Name)