github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 15:58:37 +00:00
Code Issues Projects Releases Wiki Activity

Replace duplicate pod status code with function

Browse Source
This commit is contained in:
tcharding 2017-07-27 07:59:09 +10:00
parent 46a5a1f25b
commit 9c063c1ace
1 changed files with 23 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
pkg/kubelet/kubelet_test.go
View File

@ -418,6 +418,12 @@ func (ls testNodeLister) List(selector labels.Selector) ([]*v1.Node, error) {
return ls.nodes, nil return ls.nodes, nil
} }
func checkPodStatus(t *testing.T, kl *Kubelet, pod *v1.Pod, phase v1.PodPhase) {
status, found := kl.statusManager.GetPodStatus(pod.UID)
require.True(t, found, "Status of pod %q is not found in the status map", pod.UID)
require.Equal(t, phase, status.Phase)
}
// Tests that we handle port conflicts correctly by setting the failed status in status map. // Tests that we handle port conflicts correctly by setting the failed status in status map.
func TestHandlePortConflicts(t *testing.T) { func TestHandlePortConflicts(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
@ -449,16 +455,10 @@ func TestHandlePortConflicts(t *testing.T) {
fittingPod := pods[1] fittingPod := pods[1]
kl.HandlePodAdditions(pods) kl.HandlePodAdditions(pods)
// Check pod status stored in the status map.
// notfittingPod should be Failed
status, found := kl.statusManager.GetPodStatus(notfittingPod.UID)
require.True(t, found, "Status of pod %q is not found in the status map", notfittingPod.UID)
require.Equal(t, v1.PodFailed, status.Phase)
// fittingPod should be Pending // Check pod status stored in the status map.
status, found = kl.statusManager.GetPodStatus(fittingPod.UID) checkPodStatus(t, kl, notfittingPod, v1.PodFailed)
require.True(t, found, "Status of pod %q is not found in the status map", fittingPod.UID) checkPodStatus(t, kl, fittingPod, v1.PodPending)
require.Equal(t, v1.PodPending, status.Phase)
} }
// Tests that we handle host name conflicts correctly by setting the failed status in status map. // Tests that we handle host name conflicts correctly by setting the failed status in status map.
@ -489,16 +489,10 @@ func TestHandleHostNameConflicts(t *testing.T) {
fittingPod := pods[1] fittingPod := pods[1]
kl.HandlePodAdditions(pods) kl.HandlePodAdditions(pods)
// Check pod status stored in the status map.
// notfittingPod should be Failed
status, found := kl.statusManager.GetPodStatus(notfittingPod.UID)
require.True(t, found, "Status of pod %q is not found in the status map", notfittingPod.UID)
require.Equal(t, v1.PodFailed, status.Phase)
// fittingPod should be Pending // Check pod status stored in the status map.
status, found = kl.statusManager.GetPodStatus(fittingPod.UID) checkPodStatus(t, kl, notfittingPod, v1.PodFailed)
require.True(t, found, "Status of pod %q is not found in the status map", fittingPod.UID) checkPodStatus(t, kl, fittingPod, v1.PodPending)
require.Equal(t, v1.PodPending, status.Phase)
} }
// Tests that we handle not matching labels selector correctly by setting the failed status in status map. // Tests that we handle not matching labels selector correctly by setting the failed status in status map.
@ -527,16 +521,10 @@ func TestHandleNodeSelector(t *testing.T) {
fittingPod := pods[1] fittingPod := pods[1]
kl.HandlePodAdditions(pods) kl.HandlePodAdditions(pods)
// Check pod status stored in the status map.
// notfittingPod should be Failed
status, found := kl.statusManager.GetPodStatus(notfittingPod.UID)
require.True(t, found, "Status of pod %q is not found in the status map", notfittingPod.UID)
require.Equal(t, v1.PodFailed, status.Phase)
// fittingPod should be Pending // Check pod status stored in the status map.
status, found = kl.statusManager.GetPodStatus(fittingPod.UID) checkPodStatus(t, kl, notfittingPod, v1.PodFailed)
require.True(t, found, "Status of pod %q is not found in the status map", fittingPod.UID) checkPodStatus(t, kl, fittingPod, v1.PodPending)
require.Equal(t, v1.PodPending, status.Phase)
} }
// Tests that we handle exceeded resources correctly by setting the failed status in status map. // Tests that we handle exceeded resources correctly by setting the failed status in status map.
@ -574,16 +562,10 @@ func TestHandleMemExceeded(t *testing.T) {
fittingPod := pods[1] fittingPod := pods[1]
kl.HandlePodAdditions(pods) kl.HandlePodAdditions(pods)
// Check pod status stored in the status map.
// notfittingPod should be Failed
status, found := kl.statusManager.GetPodStatus(notfittingPod.UID)
require.True(t, found, "Status of pod %q is not found in the status map", notfittingPod.UID)
require.Equal(t, v1.PodFailed, status.Phase)
// fittingPod should be Pending // Check pod status stored in the status map.
status, found = kl.statusManager.GetPodStatus(fittingPod.UID) checkPodStatus(t, kl, notfittingPod, v1.PodFailed)
require.True(t, found, "Status of pod %q is not found in the status map", fittingPod.UID) checkPodStatus(t, kl, fittingPod, v1.PodPending)
require.Equal(t, v1.PodPending, status.Phase)
} }
// TODO(filipg): This test should be removed once StatusSyncer can do garbage collection without external signal. // TODO(filipg): This test should be removed once StatusSyncer can do garbage collection without external signal.
@ -1892,16 +1874,10 @@ func TestHandlePodAdditionsInvokesPodAdmitHandlers(t *testing.T) {
kl.admitHandlers.AddPodAdmitHandler(&testPodAdmitHandler{podsToReject: podsToReject}) kl.admitHandlers.AddPodAdmitHandler(&testPodAdmitHandler{podsToReject: podsToReject})
kl.HandlePodAdditions(pods) kl.HandlePodAdditions(pods)
// Check pod status stored in the status map.
// podToReject should be Failed
status, found := kl.statusManager.GetPodStatus(podToReject.UID)
require.True(t, found, "Status of pod %q is not found in the status map", podToAdmit.UID)
require.Equal(t, v1.PodFailed, status.Phase)
// podToAdmit should be Pending // Check pod status stored in the status map.
status, found = kl.statusManager.GetPodStatus(podToAdmit.UID) checkPodStatus(t, kl, podToReject, v1.PodFailed)
require.True(t, found, "Status of pod %q is not found in the status map", podToAdmit.UID) checkPodStatus(t, kl, podToAdmit, v1.PodPending)
require.Equal(t, v1.PodPending, status.Phase)
} }
// testPodSyncLoopHandler is a lifecycle.PodSyncLoopHandler that is used for testing. // testPodSyncLoopHandler is a lifecycle.PodSyncLoopHandler that is used for testing.
@ -2005,10 +1981,9 @@ func TestSyncPodKillPod(t *testing.T) {
}, },
}) })
require.NoError(t, err) require.NoError(t, err)
// Check pod status stored in the status map. // Check pod status stored in the status map.
status, found := kl.statusManager.GetPodStatus(pod.UID) checkPodStatus(t, kl, pod, v1.PodFailed)
require.True(t, found, "Status of pod %q is not found in the status map", pod.UID)
require.Equal(t, v1.PodFailed, status.Phase)
} }
func waitForVolumeUnmount( func waitForVolumeUnmount(