github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Avoid unnecessary gcloud call if test was skipped

Browse Source
This commit is contained in:
Aleksandra Malinowska 2017-10-09 11:34:44 +02:00
parent ee80933d34
commit 73a1227f39
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/autoscaling/autoscaling_timer.go
View File

@ -68,9 +68,13 @@ var _ = SIGDescribe("[Feature:ClusterSizeAutoscalingScaleUp] [Slow] Autoscaling"
}) })
AfterEach(func() { AfterEach(func() {
// Scale down back to only 'nodesNum' nodes, as expected at the start of the test. // Attempt cleanup only if a node group was targeted for scale up.
framework.ExpectNoError(framework.ResizeGroup(nodeGroupName, nodesNum)) // Otherwise the test was probably skipped and we'll get a gcloud error due to invalid parameters.
framework.ExpectNoError(framework.WaitForReadyNodes(f.ClientSet, nodesNum, 15*time.Minute)) if len(nodeGroupName) > 0 {
// Scale down back to only 'nodesNum' nodes, as expected at the start of the test.
framework.ExpectNoError(framework.ResizeGroup(nodeGroupName, nodesNum))
framework.ExpectNoError(framework.WaitForReadyNodes(f.ClientSet, nodesNum, 15*time.Minute))
}
}) })
Measure("takes less than 15 minutes", func(b Benchmarker) { Measure("takes less than 15 minutes", func(b Benchmarker) {