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

fixup container probe test to use gcr.io/google_containers/test-webserver and add some debug testing and reduce the test length

Browse Source
This commit is contained in:
Mike Danese 2015-07-06 09:11:10 -07:00
parent c7fb07a6aa
commit 1f59d793ad
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
test/e2e/container_probe.go
View File

@ -31,7 +31,7 @@ import (
var _ = Describe("Probing container", func() { var _ = Describe("Probing container", func() {
framework := Framework{BaseName: "container-probe"} framework := Framework{BaseName: "container-probe"}
var podClient client.PodInterface var podClient client.PodInterface
probe := nginxProbeBuilder{} probe := webserverProbeBuilder{}
BeforeEach(func() { BeforeEach(func() {
framework.beforeEach() framework.beforeEach()
@ -45,13 +45,18 @@ var _ = Describe("Probing container", func() {
expectNoError(err) expectNoError(err)
startTime := time.Now() startTime := time.Now()
expectNoError(wait.Poll(poll, 90*time.Second, func() (bool, error) { Expect(wait.Poll(poll, 90*time.Second, func() (bool, error) {
p, err := podClient.Get(p.Name) p, err := podClient.Get(p.Name)
if err != nil { if err != nil {
return false, err return false, err
} }
return api.IsPodReady(p), nil ready := api.IsPodReady(p)
})) if !ready {
Logf("pod is not yet ready; pod has phase %q.", p.Status.Phase)
return false, nil
}
return true, nil
})).NotTo(HaveOccurred(), "pod never became ready")
if time.Since(startTime) < 30*time.Second { if time.Since(startTime) < 30*time.Second {
Failf("Pod became ready before it's initial delay") Failf("Pod became ready before it's initial delay")
@ -62,9 +67,10 @@ var _ = Describe("Probing container", func() {
isReady, err := podRunningReady(p) isReady, err := podRunningReady(p)
expectNoError(err) expectNoError(err)
Expect(isReady).To(BeTrue()) Expect(isReady).To(BeTrue(), "pod should be ready")
Expect(getRestartCount(p) == 0).To(BeTrue()) restartCount := getRestartCount(p)
Expect(restartCount == 0).To(BeTrue(), "pod should have a restart count of 0 but got %v", restartCount)
}) })
It("with readiness probe that fails should never be ready and never restart", func() { It("with readiness probe that fails should never be ready and never restart", func() {
@ -86,9 +92,10 @@ var _ = Describe("Probing container", func() {
expectNoError(err) expectNoError(err)
isReady, err := podRunningReady(p) isReady, err := podRunningReady(p)
Expect(isReady).NotTo(BeTrue()) Expect(isReady).NotTo(BeTrue(), "pod should be not ready")
Expect(getRestartCount(p) == 0).To(BeTrue()) restartCount := getRestartCount(p)
Expect(restartCount == 0).To(BeTrue(), "pod should have a restart count of 0 but got %v", restartCount)
}) })
}) })
@ -103,12 +110,12 @@ func getRestartCount(p *api.Pod) int {
func makePodSpec(readinessProbe, livenessProbe *api.Probe) *api.Pod { func makePodSpec(readinessProbe, livenessProbe *api.Probe) *api.Pod {
pod := &api.Pod{ pod := &api.Pod{
ObjectMeta: api.ObjectMeta{Name: "nginx-" + string(util.NewUUID())}, ObjectMeta: api.ObjectMeta{Name: "test-webserver-" + string(util.NewUUID())},
Spec: api.PodSpec{ Spec: api.PodSpec{
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "nginx", Name: "test-webserver",
Image: "nginx", Image: "gcr.io/google_containers/test-webserver",
LivenessProbe: livenessProbe, LivenessProbe: livenessProbe,
ReadinessProbe: readinessProbe, ReadinessProbe: readinessProbe,
}, },
@ -118,22 +125,22 @@ func makePodSpec(readinessProbe, livenessProbe *api.Probe) *api.Pod {
return pod return pod
} }
type nginxProbeBuilder struct { type webserverProbeBuilder struct {
failing bool failing bool
initialDelay bool initialDelay bool
} }
func (b nginxProbeBuilder) withFailing() nginxProbeBuilder { func (b webserverProbeBuilder) withFailing() webserverProbeBuilder {
b.failing = true b.failing = true
return b return b
} }
func (b nginxProbeBuilder) withInitialDelay() nginxProbeBuilder { func (b webserverProbeBuilder) withInitialDelay() webserverProbeBuilder {
b.initialDelay = true b.initialDelay = true
return b return b
} }
func (b nginxProbeBuilder) build() *api.Probe { func (b webserverProbeBuilder) build() *api.Probe {
probe := &api.Probe{ probe := &api.Probe{
Handler: api.Handler{ Handler: api.Handler{
HTTPGet: &api.HTTPGetAction{ HTTPGet: &api.HTTPGetAction{