github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Use gomega.Consistently instead of sleeping

Browse Source
This commit is contained in:
Mahmoud Atwa 2024-01-12 16:26:06 +00:00
parent 6073d1cd3d
commit 73565cde13
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/autoscaling/cluster_size_autoscaling.go
View File

@ -1022,12 +1022,13 @@ var _ = SIGDescribe("Cluster size autoscaling", framework.WithSlow(), func() {
reservedMemory := int(float64(0.5) * float64(memAllocatableMb)) reservedMemory := int(float64(0.5) * float64(memAllocatableMb))
ginkgo.DeferCleanup(ReserveMemoryWithSchedulerName(ctx, f, "memory-reservation", replicaCount, reservedMemory, false, 1, nonExistingBypassedSchedulerName)) ginkgo.DeferCleanup(ReserveMemoryWithSchedulerName(ctx, f, "memory-reservation", replicaCount, reservedMemory, false, 1, nonExistingBypassedSchedulerName))
// Verify that cluster size is the same // Verify that cluster size is the same
ginkgo.By(fmt.Sprintf("Waiting for scale up hoping it won't happen, sleep for %s", scaleUpTimeout.String())) ginkgo.By(fmt.Sprintf("Waiting for scale up hoping it won't happen, polling cluster size for %s", scaleUpTimeout.String()))
time.Sleep(scaleUpTimeout)
sizeFunc := func(size int) bool { sizeFunc := func(size int) bool {
return size == nodeCount return size == nodeCount
} }
framework.ExpectNoError(WaitForClusterSizeFuncWithUnready(ctx, f.ClientSet, sizeFunc, time.Second, 0)) gomega.Consistently(ctx, func() error {
return WaitForClusterSizeFunc(ctx, f.ClientSet, sizeFunc, time.Second)
}).WithTimeout(scaleUpTimeout).WithPolling(framework.Poll).ShouldNot(gomega.HaveOccurred())
}) })
f.It("shouldn't scale up when unprocessed pod is created and scheduler is not specified to be bypassed", feature.ClusterScaleUpBypassScheduler, func(ctx context.Context) { f.It("shouldn't scale up when unprocessed pod is created and scheduler is not specified to be bypassed", feature.ClusterScaleUpBypassScheduler, func(ctx context.Context) {
// 70% of allocatable memory of a single node * replica count, forcing a scale up in case of normal pods // 70% of allocatable memory of a single node * replica count, forcing a scale up in case of normal pods
@ -1036,12 +1037,13 @@ var _ = SIGDescribe("Cluster size autoscaling", framework.WithSlow(), func() {
schedulerName := "non-existent-scheduler-" + f.UniqueName schedulerName := "non-existent-scheduler-" + f.UniqueName
ginkgo.DeferCleanup(ReserveMemoryWithSchedulerName(ctx, f, "memory-reservation", replicaCount, reservedMemory, false, 1, schedulerName)) ginkgo.DeferCleanup(ReserveMemoryWithSchedulerName(ctx, f, "memory-reservation", replicaCount, reservedMemory, false, 1, schedulerName))
// Verify that cluster size is the same // Verify that cluster size is the same
ginkgo.By(fmt.Sprintf("Waiting for scale up hoping it won't happen, sleep for %s", scaleUpTimeout.String())) ginkgo.By(fmt.Sprintf("Waiting for scale up hoping it won't happen, polling cluster size for %s", scaleUpTimeout.String()))
time.Sleep(scaleUpTimeout)
sizeFunc := func(size int) bool { sizeFunc := func(size int) bool {
return size == nodeCount return size == nodeCount
} }
framework.ExpectNoError(WaitForClusterSizeFuncWithUnready(ctx, f.ClientSet, sizeFunc, time.Second, 0)) gomega.Consistently(ctx, func() error {
return WaitForClusterSizeFunc(ctx, f.ClientSet, sizeFunc, time.Second)
}).WithTimeout(scaleUpTimeout).WithPolling(framework.Poll).ShouldNot(gomega.HaveOccurred())
}) })
}) })