Use DesiredState rather than CurrentState for Host.

This commit is contained in:
Daniel Smith
2014-08-11 15:12:51 -07:00
parent b7752a86d4
commit b5352a81c7
2 changed files with 19 additions and 8 deletions

View File

@@ -298,7 +298,7 @@ func TestEtcdDeletePod(t *testing.T) {
key := "/registry/pods/foo"
fakeClient.Set(key, api.EncodeOrDie(api.Pod{
JSONBase: api.JSONBase{ID: "foo"},
CurrentState: api.PodState{Host: "machine"},
DesiredState: api.PodState{Host: "machine"},
}), 0)
fakeClient.Set("/registry/hosts/machine/kubelet", api.EncodeOrDie(&api.ContainerManifestList{
Items: []api.ContainerManifest{
@@ -334,7 +334,7 @@ func TestEtcdDeletePodMultipleContainers(t *testing.T) {
key := "/registry/pods/foo"
fakeClient.Set(key, api.EncodeOrDie(api.Pod{
JSONBase: api.JSONBase{ID: "foo"},
CurrentState: api.PodState{Host: "machine"},
DesiredState: api.PodState{Host: "machine"},
}), 0)
fakeClient.Set("/registry/hosts/machine/kubelet", api.EncodeOrDie(&api.ContainerManifestList{
Items: []api.ContainerManifest{
@@ -418,13 +418,13 @@ func TestEtcdListPods(t *testing.T) {
{
Value: api.EncodeOrDie(api.Pod{
JSONBase: api.JSONBase{ID: "foo"},
CurrentState: api.PodState{Host: "machine"},
DesiredState: api.PodState{Host: "machine"},
}),
},
{
Value: api.EncodeOrDie(api.Pod{
JSONBase: api.JSONBase{ID: "bar"},
CurrentState: api.PodState{Host: "machine"},
DesiredState: api.PodState{Host: "machine"},
}),
},
},