github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Rename waitForPodCondition in lifecycle_test.go to improve code readability

Browse Source
This commit is contained in:
drfish 2020-03-22 11:53:51 +08:00
parent fb9810c341
commit 9d7dc80b48
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/integration/node/lifecycle_test.go
View File

@ -71,18 +71,18 @@ func TestTaintBasedEvictions(t *testing.T) {
} }
tolerationSeconds := []int64{200, 300, 0} tolerationSeconds := []int64{200, 300, 0}
tests := []struct { tests := []struct {
name string name string
nodeTaints []v1.Taint nodeTaints []v1.Taint
nodeConditions []v1.NodeCondition nodeConditions []v1.NodeCondition
pod *v1.Pod pod *v1.Pod
waitForPodCondition string expectedWaitForPodCondition string
}{ }{
{ {
name: "Taint based evictions for NodeNotReady and 200 tolerationseconds", name: "Taint based evictions for NodeNotReady and 200 tolerationseconds",
nodeTaints: []v1.Taint{{Key: v1.TaintNodeNotReady, Effect: v1.TaintEffectNoExecute}}, nodeTaints: []v1.Taint{{Key: v1.TaintNodeNotReady, Effect: v1.TaintEffectNoExecute}},
nodeConditions: []v1.NodeCondition{{Type: v1.NodeReady, Status: v1.ConditionFalse}}, nodeConditions: []v1.NodeCondition{{Type: v1.NodeReady, Status: v1.ConditionFalse}},
pod: testPod, pod: testPod,
waitForPodCondition: "updated with tolerationSeconds of 200", expectedWaitForPodCondition: "updated with tolerationSeconds of 200",
}, },
{ {
name: "Taint based evictions for NodeNotReady with no pod tolerations", name: "Taint based evictions for NodeNotReady with no pod tolerations",
@ -96,14 +96,14 @@ func TestTaintBasedEvictions(t *testing.T) {
}, },
}, },
}, },
waitForPodCondition: "updated with tolerationSeconds=300", expectedWaitForPodCondition: "updated with tolerationSeconds=300",
}, },
{ {
name: "Taint based evictions for NodeNotReady and 0 tolerationseconds", name: "Taint based evictions for NodeNotReady and 0 tolerationseconds",
nodeTaints: []v1.Taint{{Key: v1.TaintNodeNotReady, Effect: v1.TaintEffectNoExecute}}, nodeTaints: []v1.Taint{{Key: v1.TaintNodeNotReady, Effect: v1.TaintEffectNoExecute}},
nodeConditions: []v1.NodeCondition{{Type: v1.NodeReady, Status: v1.ConditionFalse}}, nodeConditions: []v1.NodeCondition{{Type: v1.NodeReady, Status: v1.ConditionFalse}},
pod: testPod, pod: testPod,
waitForPodCondition: "terminating", expectedWaitForPodCondition: "terminating",
}, },
{ {
name: "Taint based evictions for NodeUnreachable", name: "Taint based evictions for NodeUnreachable",
@ -281,7 +281,7 @@ func TestTaintBasedEvictions(t *testing.T) {
} }
if test.pod != nil { if test.pod != nil {
err = waitForPodCondition(cs, testCtx.NS.Name, test.pod.Name, test.waitForPodCondition, time.Second*15, func(pod *v1.Pod) (bool, error) { err = waitForPodCondition(cs, testCtx.NS.Name, test.pod.Name, test.expectedWaitForPodCondition, time.Second*15, func(pod *v1.Pod) (bool, error) {
// as node is unreachable, pod0 is expected to be in Terminating status // as node is unreachable, pod0 is expected to be in Terminating status
// rather than getting deleted // rather than getting deleted
if tolerationSeconds[i] == 0 { if tolerationSeconds[i] == 0 {
@ -294,7 +294,7 @@ func TestTaintBasedEvictions(t *testing.T) {
}, t) }, t)
if err != nil { if err != nil {
pod, _ := cs.CoreV1().Pods(testCtx.NS.Name).Get(context.TODO(), test.pod.Name, metav1.GetOptions{}) pod, _ := cs.CoreV1().Pods(testCtx.NS.Name).Get(context.TODO(), test.pod.Name, metav1.GetOptions{})
t.Fatalf("Error: %v, Expected test pod to be %s but it's %v", err, test.waitForPodCondition, pod) t.Fatalf("Error: %v, Expected test pod to be %s but it's %v", err, test.expectedWaitForPodCondition, pod)
} }
testutils.CleanupPods(cs, t, []*v1.Pod{test.pod}) testutils.CleanupPods(cs, t, []*v1.Pod{test.pod})
} }