github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

seperate readiness and liveness in the code

Browse Source
This commit is contained in:
Mike Danese
2015-06-11 10:47:25 -07:00
parent 5a02fc07d8
commit 35771acdfa
2 changed files with 87 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/kubelet/dockertools/manager_test.go
View File

@@ -583,6 +583,8 @@ func replaceProber(dm *DockerManager, result probe.Result, err error) {
// delay has passed, whether the probe handler will return Success, Failure,
// Unknown or error.
//
// PLEASE READ THE PROBE DOCS BEFORE CHANGING THIS TEST IF YOU ARE UNSURE HOW PROBES ARE SUPPOSED TO WORK:
// (See https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/pod-states.md#pod-conditions)
func TestProbeContainer(t *testing.T) {
manager, _ := newTestDockerManager()
dc := &docker.APIContainers{
@@ -601,7 +603,7 @@ func TestProbeContainer(t *testing.T) {
expectedResult: probe.Success,
expectedReadiness: true,
},
// Only LivenessProbe.
// Only LivenessProbe. expectedReadiness should always be true here.
{
testContainer: api.Container{
LivenessProbe: &api.Probe{InitialDelaySeconds: 100},
@@ -614,7 +616,7 @@ func TestProbeContainer(t *testing.T) {
LivenessProbe: &api.Probe{InitialDelaySeconds: -100},
},
expectedResult: probe.Unknown,
expectedReadiness: false,
expectedReadiness: true,
},
{
testContainer: api.Container{
@@ -626,7 +628,7 @@ func TestProbeContainer(t *testing.T) {
},
},
expectedResult: probe.Failure,
expectedReadiness: false,
expectedReadiness: true,
},
{
testContainer: api.Container{
@@ -650,7 +652,7 @@ func TestProbeContainer(t *testing.T) {
},
},
expectedResult: probe.Unknown,
expectedReadiness: false,
expectedReadiness: true,
},
{
testContainer: api.Container{
@@ -663,21 +665,21 @@ func TestProbeContainer(t *testing.T) {
},
expectError: true,
expectedResult: probe.Unknown,
expectedReadiness: false,
expectedReadiness: true,
},
// Only ReadinessProbe.
// // Only ReadinessProbe. expectedResult should always be probe.Success here.
{
testContainer: api.Container{
ReadinessProbe: &api.Probe{InitialDelaySeconds: 100},
},
expectedResult: probe.Failure,
expectedResult: probe.Success,
expectedReadiness: false,
},
{
testContainer: api.Container{
ReadinessProbe: &api.Probe{InitialDelaySeconds: -100},
},
expectedResult: probe.Unknown,
expectedResult: probe.Success,
expectedReadiness: false,
},
{
@@ -735,7 +737,7 @@ func TestProbeContainer(t *testing.T) {
LivenessProbe: &api.Probe{InitialDelaySeconds: 100},
ReadinessProbe: &api.Probe{InitialDelaySeconds: 100},
},
expectedResult: probe.Failure,
expectedResult: probe.Success,
expectedReadiness: false,
},
{
@@ -743,7 +745,7 @@ func TestProbeContainer(t *testing.T) {
LivenessProbe: &api.Probe{InitialDelaySeconds: 100},
ReadinessProbe: &api.Probe{InitialDelaySeconds: -100},
},
expectedResult: probe.Unknown,
expectedResult: probe.Success,
expectedReadiness: false,
},
{
@@ -816,16 +818,16 @@ func TestProbeContainer(t *testing.T) {
}
result, err := manager.prober.Probe(&api.Pod{}, api.PodStatus{}, test.testContainer, dc.ID, dc.Created)
if test.expectError && err == nil {
t.Error("[%d] Expected error but did no error was returned.", i)
t.Error("[%d] Expected error but no error was returned.", i)
}
if !test.expectError && err != nil {
t.Errorf("[%d] Expected error but got: %v", i, err)
t.Errorf("[%d] Didn't expect error but got: %v", i, err)
}
if test.expectedResult != result {
t.Errorf("[%d] Expected result was %v but probeContainer() returned %v", i, test.expectedResult, result)
t.Errorf("[%d] Expected result to be %v but was %v", i, test.expectedResult, result)
}
if test.expectedReadiness != manager.readinessManager.GetReadiness(dc.ID) {
t.Errorf("[%d] Expected readiness was %v but probeContainer() set %v", i, test.expectedReadiness, manager.readinessManager.GetReadiness(dc.ID))
t.Errorf("[%d] Expected readiness to be %v but was %v", i, test.expectedReadiness, manager.readinessManager.GetReadiness(dc.ID))
}
}
}