Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed panic in autoscaling e2e tests #14654

Merged
merged 1 commit into from
Sep 28, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 14 additions & 14 deletions test/e2e/horizontal_pod_autoscaling.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,116 +36,116 @@ var _ = Describe("Horizontal pod autoscaling", func() {
// CPU tests
It("[Skipped][Autoscaling Suite] should scale from 1 pod to 3 pods (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 700, 0, 800, 100, f)
defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.3")
rc.WaitForReplicas(3)
rc.CleanUp()
})

It("[Skipped][Horizontal pod autoscaling Suite] should scale from 3 pods to 1 pod (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 3, 0, 0, 100, 100, f)
defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.7")
rc.WaitForReplicas(1)
rc.CleanUp()
})

It("[Skipped][Horizontal pod autoscaling Suite] should scale from 1 pod to maximum 5 pods (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 700, 0, 800, 100, f)
defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.1")
rc.WaitForReplicas(5)
rc.CleanUp()
})

It("[Skipped][Horizontal pod autoscaling Suite] should scale from 1 pod to 3 pods and from 3 to 1 (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 700, 0, 800, 100, f)
defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.3")
rc.WaitForReplicas(3)
rc.ConsumeCPU(300)
rc.WaitForReplicas(1)
rc.CleanUp()
})

It("[Skipped][Horizontal pod autoscaling Suite] should scale from 1 pod to 3 pods and from 3 to 5 (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 250, 0, 400, 100, f)
defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.1")
rc.WaitForReplicas(3)
rc.ConsumeCPU(700)
rc.WaitForReplicas(5)
rc.CleanUp()
})

It("[Skipped][Horizontal pod autoscaling Suite] should scale from 3 pods to 1 pod and from 1 to 3 (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 3, 0, 0, 800, 100, f)
defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.3")
rc.WaitForReplicas(1)
rc.ConsumeCPU(700)
rc.WaitForReplicas(3)
rc.CleanUp()
})

It("[Skipped][Horizontal pod autoscaling Suite] should scale from 5 pods to 3 pods and from 3 to 1 (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 5, 700, 0, 200, 100, f)
defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.3")
rc.WaitForReplicas(3)
rc.ConsumeCPU(100)
rc.WaitForReplicas(1)
rc.CleanUp()
})

// Memory tests
It("[Skipped][Horizontal pod autoscaling Suite] should scale from 1 pod to 3 pods (scale resource: Memory)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 0, 800, 100, 900, f)
defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "300")
rc.WaitForReplicas(3)
rc.CleanUp()
})

It("[Skipped][Horizontal pod autoscaling Suite] should scale from 3 pods to 1 pod (scale resource: Memory)", func() {
rc = NewDynamicResourceConsumer("rc", 3, 0, 0, 100, 100, f)
defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "700")
rc.WaitForReplicas(1)
rc.CleanUp()
})

It("[Skipped][Horizontal pod autoscaling Suite] should scale from 1 pod to maximum 5 pods (scale resource: Memory)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 0, 700, 100, 800, f)
defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "100")
rc.WaitForReplicas(5)
rc.CleanUp()
})

It("[Skipped][Horizontal pod autoscaling Suite] should scale from 1 pod to 3 pods and from 3 to 1 (scale resource: Memory)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 0, 700, 100, 800, f)
defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "300")
rc.WaitForReplicas(3)
rc.ConsumeMem(100)
rc.WaitForReplicas(1)
rc.CleanUp()
})

It("[Skipped][Horizontal pod autoscaling Suite] should scale from 1 pod to 3 pods and from 3 to 5 (scale resource: Memory)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 0, 500, 100, 1100, f)
defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "200")
rc.WaitForReplicas(3)
rc.ConsumeMem(1000)
rc.WaitForReplicas(5)
rc.CleanUp()
})

It("[Skipped][Horizontal pod autoscaling Suite] should scale from 3 pods to 1 pod and from 1 to 3 (scale resource: Memory)", func() {
rc = NewDynamicResourceConsumer("rc", 3, 0, 0, 100, 800, f)
defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "300")
rc.WaitForReplicas(1)
rc.ConsumeMem(700)
rc.WaitForReplicas(3)
rc.CleanUp()
})
It("[Skipped][Autoscaling Suite] should scale from 5 pods to 3 pods and from 3 to 1 (scale resource: Memory)", func() {
rc = NewDynamicResourceConsumer("rc", 5, 0, 700, 100, 800, f)
defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "300")
rc.WaitForReplicas(3)
rc.ConsumeMem(100)
rc.WaitForReplicas(1)
rc.CleanUp()
})

})
Expand Down