scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106200 from NikhilSharmaWe/betterOutputAutoscaling

Browse Source 
Changed code to improve output for files under test/e2e/autoscaling
This commit is contained in:
Kubernetes Prow Robot
2021-12-29 16:30:49 -08:00
committed by GitHub
parent f5be5052e3 02b702f706
commit 7c013c3f64
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,7 +184,9 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
}
}
}
framework.ExpectEqual(eventFound, true)
if !eventFound {
framework.Failf("Expected event with kind 'Pod' and reason 'NotTriggerScaleUp' not found.")
}
// Verify that cluster size is not changed
framework.ExpectNoError(WaitForClusterSizeFunc(f.ClientSet,
func(size int) bool { return size <= nodeCount }, time.Second))
@@ -851,7 +853,9 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
framework.ExpectNoError(e2enode.WaitForReadyNodes(c, nodeCount-minSize+1, resizeTimeout))
ngNodes, err := framework.GetGroupNodes(minMig)
framework.ExpectNoError(err)
framework.ExpectEqual(len(ngNodes) == 1, true)
if len(ngNodes) != 1 {
framework.Failf("Expected one node, got instead: %v", ngNodes)
}
node, err := f.ClientSet.CoreV1().Nodes().Get(context.TODO(), ngNodes[0], metav1.GetOptions{})
ginkgo.By(fmt.Sprintf("Target node for scale-down: %s", node.Name))
framework.ExpectNoError(err)
@@ -907,7 +911,9 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
"spec.unschedulable": "false",
}.AsSelector().String()})
framework.ExpectNoError(err)
framework.ExpectEqual(nodesToBreakCount <= len(nodes.Items), true)
if nodesToBreakCount > len(nodes.Items) {
framework.Failf("Expected at most %d nodes to break, got %d", len(nodes.Items), nodesToBreakCount)
}
nodesToBreak := nodes.Items[:nodesToBreakCount]
// TestUnderTemporaryNetworkFailure only removes connectivity to a single node,
@@ -1944,7 +1950,9 @@ func createPriorityClasses(f *framework.Framework) func() {
if err != nil {
klog.Errorf("Error creating priority class: %v", err)
}
framework.ExpectEqual(err == nil || apierrors.IsAlreadyExists(err), true)
if err != nil && !apierrors.IsAlreadyExists(err) {
framework.Failf("unexpected error while creating priority class: %v", err)
}
}
return func() {