Skip to content

Commit 83a8e8c

Browse files
authored
Merge pull request kubernetes#85711 from tanjunchen/use-ExpectEqual-test-e2e-auto
use ExpectEqual of framework in test/e2e/autoscaling/
2 parents 8be1202 + 4d9c2a4 commit 83a8e8c

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

test/e2e/autoscaling/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ go_library(
5050
"//test/utils:go_default_library",
5151
"//test/utils/image:go_default_library",
5252
"//vendor/github.com/onsi/ginkgo:go_default_library",
53-
"//vendor/github.com/onsi/gomega:go_default_library",
5453
"//vendor/golang.org/x/oauth2/google:go_default_library",
5554
"//vendor/google.golang.org/api/monitoring/v3:go_default_library",
5655
"//vendor/k8s.io/klog:go_default_library",

test/e2e/autoscaling/cluster_size_autoscaling.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ import (
5353
imageutils "k8s.io/kubernetes/test/utils/image"
5454

5555
"github.com/onsi/ginkgo"
56-
"github.com/onsi/gomega"
5756
)
5857

5958
const (
@@ -122,7 +121,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
122121
coreCount += quantity.Value()
123122
}
124123
ginkgo.By(fmt.Sprintf("Initial number of schedulable nodes: %v", nodeCount))
125-
gomega.Expect(nodeCount).NotTo(gomega.BeZero())
124+
framework.ExpectNotEqual(nodeCount, 0)
126125
mem := nodes.Items[0].Status.Allocatable[v1.ResourceMemory]
127126
memAllocatableMb = int((&mem).Value() / 1024 / 1024)
128127

@@ -856,7 +855,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
856855
framework.ExpectNoError(e2enode.WaitForReadyNodes(c, nodeCount-minSize+1, resizeTimeout))
857856
ngNodes, err := framework.GetGroupNodes(minMig)
858857
framework.ExpectNoError(err)
859-
gomega.Expect(len(ngNodes) == 1).To(gomega.BeTrue())
858+
framework.ExpectEqual(len(ngNodes) == 1, true)
860859
node, err := f.ClientSet.CoreV1().Nodes().Get(ngNodes[0], metav1.GetOptions{})
861860
ginkgo.By(fmt.Sprintf("Target node for scale-down: %s", node.Name))
862861
framework.ExpectNoError(err)
@@ -909,7 +908,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
909908
"spec.unschedulable": "false",
910909
}.AsSelector().String()})
911910
framework.ExpectNoError(err)
912-
gomega.Expect(nodesToBreakCount <= len(nodes.Items)).To(gomega.BeTrue())
911+
framework.ExpectEqual(nodesToBreakCount <= len(nodes.Items), true)
913912
nodesToBreak := nodes.Items[:nodesToBreakCount]
914913

915914
// TestUnderTemporaryNetworkFailure only removes connectivity to a single node,

0 commit comments

Comments
 (0)