Skip to content

Commit

Permalink
Merge pull request #38454 from jszczepkowski/automated-cherry-pick-of…
Browse files Browse the repository at this point in the history
…-#38377-upstream-release-1.5

Automatic merge from submit-queue

cherry-pick of #38377: HPA e2e tests: fixed problem w/blocking channel.

Automated cherry-pick of #38377. HPA e2e tests: fixed problem w/blocking channel. Resolves #38298.
  • Loading branch information
Kubernetes Submit Queue committed Dec 9, 2016
2 parents 007d6f7 + e8adc9a commit b930bfd
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/e2e/autoscaling_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,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.Namespace.Name, rc.name))
Expand Down

0 comments on commit b930bfd

Please sign in to comment.