github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

e2e_cloud: stop using deprecated framework.ExpectEqual

Browse Source
This commit is contained in:
carlory 2023-07-21 14:49:23 +08:00
parent 4457f85eb3
commit 05bb01d27a
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/cloud/gcp/addon_update.go
View File

@ -38,6 +38,7 @@ import (
admissionapi "k8s.io/pod-security-admission/api" admissionapi "k8s.io/pod-security-admission/api"
"github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
) )
// TODO: it would probably be slightly better to build up the objects // 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) { 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)
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) { func sshExec(client *ssh.Client, cmd string) (string, string, int, error) {

4
test/e2e/cloud/gcp/node_lease.go
View File

@ -109,7 +109,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, err := e2enode.GetReadySchedulableNodes(ctx, c) originalNodes, err := e2enode.GetReadySchedulableNodes(ctx, c)
framework.ExpectNoError(err) 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 { gomega.Eventually(ctx, func() error {
pass := true pass := true
@ -135,7 +135,7 @@ var _ = SIGDescribe("[Disruptive]NodeLease", func() {
framework.ExpectNoError(err) framework.ExpectNoError(err)
targetNodes, err := e2enode.GetReadySchedulableNodes(ctx, c) targetNodes, err := e2enode.GetReadySchedulableNodes(ctx, c)
framework.ExpectNoError(err) 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") ginkgo.By("verify node lease is deleted for the deleted node")
var deletedNodeName string var deletedNodeName string

4
test/e2e/cloud/nodes.go
View File

@ -30,6 +30,7 @@ import (
admissionapi "k8s.io/pod-security-admission/api" admissionapi "k8s.io/pod-security-admission/api"
"github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
) )
var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() { 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) newNodes, err := e2enode.CheckReady(ctx, c, len(origNodes.Items)-1, 5*time.Minute)
framework.ExpectNoError(err) 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{}) _, err = c.CoreV1().Nodes().Get(ctx, nodeToDelete.Name, metav1.GetOptions{})
if err == nil { if err == nil {
framework.Failf("node %q still exists when it should be deleted", nodeToDelete.Name) framework.Failf("node %q still exists when it should be deleted", nodeToDelete.Name)