From 02585c8a083dfde51881efa8d1111c56f5fdd33f Mon Sep 17 00:00:00 2001 From: SataQiu Date: Sun, 7 Jul 2019 17:09:11 +0800 Subject: [PATCH] e2e: use framework.ExpectEqual() for test/e2e/lifecycle --- test/e2e/lifecycle/addon_update.go | 2 +- test/e2e/lifecycle/node_lease.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/lifecycle/addon_update.go b/test/e2e/lifecycle/addon_update.go index 4ea458540c7..3d4c165f94b 100644 --- a/test/e2e/lifecycle/addon_update.go +++ b/test/e2e/lifecycle/addon_update.go @@ -388,7 +388,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) - gomega.Expect(rc).To(gomega.Equal(0), "error return code from executing command on the cluster: %s", cmd) + framework.ExpectEqual(rc, 0, "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/lifecycle/node_lease.go b/test/e2e/lifecycle/node_lease.go index b9adee53c22..b0e3ebc51a8 100644 --- a/test/e2e/lifecycle/node_lease.go +++ b/test/e2e/lifecycle/node_lease.go @@ -105,7 +105,7 @@ var _ = SIGDescribe("[Disruptive]NodeLease", func() { ginkgo.By("verify node lease exists for every nodes") originalNodes := framework.GetReadySchedulableNodesOrDie(c) - gomega.Expect(len(originalNodes.Items)).To(gomega.Equal(framework.TestContext.CloudConfig.NumNodes)) + framework.ExpectEqual(len(originalNodes.Items), framework.TestContext.CloudConfig.NumNodes) gomega.Eventually(func() error { pass := true @@ -130,7 +130,7 @@ var _ = SIGDescribe("[Disruptive]NodeLease", func() { err = e2enode.WaitForReadyNodes(c, framework.TestContext.CloudConfig.NumNodes-1, 10*time.Minute) gomega.Expect(err).To(gomega.BeNil()) targetNodes := framework.GetReadySchedulableNodesOrDie(c) - gomega.Expect(len(targetNodes.Items)).To(gomega.Equal(int(targetNumNodes))) + framework.ExpectEqual(len(targetNodes.Items), int(targetNumNodes)) ginkgo.By("verify node lease is deleted for the deleted node") var deletedNodeName string