From ab6ac7c94e71ee06999921ddc905683fd36338bc Mon Sep 17 00:00:00 2001 From: Oleg Shaldybin Date: Wed, 1 Jun 2016 18:47:08 -0700 Subject: [PATCH] Fix mirror pod identity change test If mirror pod identity changes it actually doesn't get updated; previously test was relying on an incorrect record pulled from a fake clientset. --- pkg/kubelet/status/status_manager_test.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/status/status_manager_test.go b/pkg/kubelet/status/status_manager_test.go index e88de8bcfe7..e6130540c73 100644 --- a/pkg/kubelet/status/status_manager_test.go +++ b/pkg/kubelet/status/status_manager_test.go @@ -526,16 +526,12 @@ func TestStaticPodStatus(t *testing.T) { mirrorPod.UID = "new-mirror-pod" mirrorPod.Status = api.PodStatus{} m.podManager.AddPod(mirrorPod) - // Expect update to new mirrorPod. + + // Expect no update to mirror pod, since UID has changed. m.testSyncBatch() verifyActions(t, m.kubeClient, []core.Action{ 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) {