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

Fix mirror pod identity change test

Browse Source 
If mirror pod identity changes it actually doesn't get updated;
previously test was relying on an incorrect record pulled from a fake
clientset.
This commit is contained in:
Oleg Shaldybin 2016-06-01 18:47:08 -07:00
parent 1f48cd27e7
commit ab6ac7c94e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/status/status_manager_test.go
View File

@ -526,16 +526,12 @@ func TestStaticPodStatus(t *testing.T) {
mirrorPod.UID = "new-mirror-pod" mirrorPod.UID = "new-mirror-pod"
mirrorPod.Status = api.PodStatus{} mirrorPod.Status = api.PodStatus{}
m.podManager.AddPod(mirrorPod) m.podManager.AddPod(mirrorPod)
// Expect update to new mirrorPod.
// Expect no update to mirror pod, since UID has changed.
m.testSyncBatch() m.testSyncBatch()
verifyActions(t, m.kubeClient, []core.Action{ verifyActions(t, m.kubeClient, []core.Action{
core.GetActionImpl{ActionImpl: core.ActionImpl{Verb: "get", Resource: unversioned.GroupVersionResource{Resource: "pods"}}}, core.GetActionImpl{ActionImpl: core.ActionImpl{Verb: "get", Resource: unversioned.GroupVersionResource{Resource: "pods"}}},
core.UpdateActionImpl{ActionImpl: core.ActionImpl{Verb: "update", Resource: unversioned.GroupVersionResource{Resource: "pods"}, Subresource: "status"}},
}) })
updateAction = client.Actions()[1].(core.UpdateActionImpl)
updatedPod = updateAction.Object.(*api.Pod)
assert.Equal(t, mirrorPod.UID, updatedPod.UID, "Expected mirrorPod (%q), but got %q", mirrorPod.UID, updatedPod.UID)
assert.True(t, isStatusEqual(&status, &updatedPod.Status), "Expected: %+v, Got: %+v", status, updatedPod.Status)
} }
func TestSetContainerReadiness(t *testing.T) { func TestSetContainerReadiness(t *testing.T) {