Merge pull request #1356 from brendandburns/healthz

Adjust the logic, so that if the apiserver restarts, or has no pod info
2014-09-18 15:15:24 -07:00
parent ed6c5edda4 17cbde0c5a
commit 12b677ad56
2 changed files with 14 additions and 1 deletions
--- a/pkg/registry/pod/rest_test.go
+++ b/pkg/registry/pod/rest_test.go
@@ -377,6 +377,16 @@ func TestMakePodStatus(t *testing.T) {
 		test   string
 	}{
 		{&api.Pod{DesiredState: desiredState, CurrentState: currentState}, api.PodWaiting, "waiting"},
+		{
+			&api.Pod{
+				DesiredState: desiredState,
+				CurrentState: api.PodState{
+					Host: "machine-2",
+				},
+			},
+			api.PodTerminated,
+			"no info, but bad machine",
+		},
 		{
 			&api.Pod{
 				DesiredState: desiredState,