github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

e2e: use framework.ExpectEqual() for test/e2e/lifecycle

Browse Source
This commit is contained in:
SataQiu 2019-07-07 17:09:11 +08:00
parent 932487c744
commit 02585c8a08
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/lifecycle/addon_update.go
View File

@ -388,7 +388,7 @@ func getMasterSSHClient() (*ssh.Client, error) {
func sshExecAndVerify(client *ssh.Client, cmd string) { func sshExecAndVerify(client *ssh.Client, cmd string) {
_, _, rc, err := sshExec(client, cmd) _, _, rc, err := sshExec(client, cmd)
framework.ExpectNoError(err, "Failed to execute %q with ssh client %+v", cmd, client) 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) { func sshExec(client *ssh.Client, cmd string) (string, string, int, error) {

4
test/e2e/lifecycle/node_lease.go
View File

@ -105,7 +105,7 @@ var _ = SIGDescribe("[Disruptive]NodeLease", func() {
ginkgo.By("verify node lease exists for every nodes") ginkgo.By("verify node lease exists for every nodes")
originalNodes := framework.GetReadySchedulableNodesOrDie(c) 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 { gomega.Eventually(func() error {
pass := true pass := true
@ -130,7 +130,7 @@ var _ = SIGDescribe("[Disruptive]NodeLease", func() {
err = e2enode.WaitForReadyNodes(c, framework.TestContext.CloudConfig.NumNodes-1, 10*time.Minute) err = e2enode.WaitForReadyNodes(c, framework.TestContext.CloudConfig.NumNodes-1, 10*time.Minute)
gomega.Expect(err).To(gomega.BeNil()) gomega.Expect(err).To(gomega.BeNil())
targetNodes := framework.GetReadySchedulableNodesOrDie(c) 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") ginkgo.By("verify node lease is deleted for the deleted node")
var deletedNodeName string var deletedNodeName string