Merge pull request #38377 from jszczepkowski/hpa-e2e-fix4

Automatic merge from submit-queue (batch tested with PRs 38377, 36365, 36648, 37691, 38339) HPA e2e tests: fixed problem w/blocking channel.

Merge pull request #38377 from jszczepkowski/hpa-e2e-fix4
126a8428 · Kubernetes Submit Queue · GitHub · 79f497bc · e94d2fdc · 126a8428
Commit 126a8428 authored Dec 08, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

autoscaling_utils.go test/e2e/autoscaling_utils.go +3 -3

No files found.
--- a/test/e2e/autoscaling_utils.go
+++ b/test/e2e/autoscaling_utils.go
@@ -299,9 +299,9 @@ func (rc *ResourceConsumer) EnsureDesiredReplicas(desiredReplicas int, timeout t

 func (rc *ResourceConsumer) CleanUp() {
 	By(fmt.Sprintf("Removing consuming RC %s", rc.name))
-	rc.stopCPU <- 0
-	rc.stopMem <- 0
-	rc.stopCustomMetric <- 0
+	close(rc.stopCPU)
+	close(rc.stopMem)
+	close(rc.stopCustomMetric)
 	// Wait some time to ensure all child goroutines are finished.
 	time.Sleep(10 * time.Second)
 	framework.ExpectNoError(framework.DeleteRCAndPods(rc.framework.ClientSet, rc.framework.InternalClientset, rc.framework.Namespace.Name, rc.name))