From 4d9c2a4ef8d2a2536ab07dd2efb8df7c252159fa Mon Sep 17 00:00:00 2001 From: tanjunchen <2799194073@qq.com> Date: Thu, 28 Nov 2019 13:53:52 +0800 Subject: [PATCH] use ExpectEqual of framework in test/e2e/autoscaling/ --- test/e2e/autoscaling/BUILD | 1 - test/e2e/autoscaling/cluster_size_autoscaling.go | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/test/e2e/autoscaling/BUILD b/test/e2e/autoscaling/BUILD index f4d72ff01eb..d9a5b314081 100644 --- a/test/e2e/autoscaling/BUILD +++ b/test/e2e/autoscaling/BUILD @@ -50,7 +50,6 @@ go_library( "//test/utils:go_default_library", "//test/utils/image:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", - "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/golang.org/x/oauth2/google:go_default_library", "//vendor/google.golang.org/api/monitoring/v3:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/test/e2e/autoscaling/cluster_size_autoscaling.go b/test/e2e/autoscaling/cluster_size_autoscaling.go index cc4c763edd9..fb3c3c47e99 100644 --- a/test/e2e/autoscaling/cluster_size_autoscaling.go +++ b/test/e2e/autoscaling/cluster_size_autoscaling.go @@ -53,7 +53,6 @@ import ( imageutils "k8s.io/kubernetes/test/utils/image" "github.com/onsi/ginkgo" - "github.com/onsi/gomega" ) const ( @@ -122,7 +121,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() { coreCount += quantity.Value() } ginkgo.By(fmt.Sprintf("Initial number of schedulable nodes: %v", nodeCount)) - gomega.Expect(nodeCount).NotTo(gomega.BeZero()) + framework.ExpectNotEqual(nodeCount, 0) mem := nodes.Items[0].Status.Allocatable[v1.ResourceMemory] memAllocatableMb = int((&mem).Value() / 1024 / 1024) @@ -856,7 +855,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() { framework.ExpectNoError(e2enode.WaitForReadyNodes(c, nodeCount-minSize+1, resizeTimeout)) ngNodes, err := framework.GetGroupNodes(minMig) framework.ExpectNoError(err) - gomega.Expect(len(ngNodes) == 1).To(gomega.BeTrue()) + framework.ExpectEqual(len(ngNodes) == 1, true) node, err := f.ClientSet.CoreV1().Nodes().Get(ngNodes[0], metav1.GetOptions{}) ginkgo.By(fmt.Sprintf("Target node for scale-down: %s", node.Name)) framework.ExpectNoError(err) @@ -909,7 +908,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() { "spec.unschedulable": "false", }.AsSelector().String()}) framework.ExpectNoError(err) - gomega.Expect(nodesToBreakCount <= len(nodes.Items)).To(gomega.BeTrue()) + framework.ExpectEqual(nodesToBreakCount <= len(nodes.Items), true) nodesToBreak := nodes.Items[:nodesToBreakCount] // TestUnderTemporaryNetworkFailure only removes connectivity to a single node,