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

Update tests.

Browse Source
This commit is contained in:
Avesh Agarwal
2017-02-07 09:08:45 -05:00
parent 9b640838a5
commit b4d3d24eaf
12 changed files with 282 additions and 702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
plugin/pkg/scheduler/algorithm/predicates/predicates_test.go
View File

@@ -2956,15 +2956,8 @@ func TestPodToleratesTaints(t *testing.T) {
},
},
node: v1.Node{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TaintsAnnotationKey: `
[{
"key": "dedicated",
"value": "user1",
"effect": "NoSchedule"
}]`,
},
Spec: v1.NodeSpec{
Taints: []v1.Taint{{Key: "dedicated", Value: "user1", Effect: "NoSchedule"}},
},
},
fits: false,
@@ -2974,29 +2967,15 @@ func TestPodToleratesTaints(t *testing.T) {
pod: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "pod1",
Annotations: map[string]string{
v1.TolerationsAnnotationKey: `
[{
"key": "dedicated",
"value": "user1",
"effect": "NoSchedule"
}]`,
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{{Image: "pod1:V1"}},
Containers: []v1.Container{{Image: "pod1:V1"}},
Tolerations: []v1.Toleration{{Key: "dedicated", Value: "user1", Effect: "NoSchedule"}},
},
},
node: v1.Node{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TaintsAnnotationKey: `
[{
"key": "dedicated",
"value": "user1",
"effect": "NoSchedule"
}]`,
},
Spec: v1.NodeSpec{
Taints: []v1.Taint{{Key: "dedicated", Value: "user1", Effect: "NoSchedule"}},
},
},
fits: true,
@@ -3006,30 +2985,15 @@ func TestPodToleratesTaints(t *testing.T) {
pod: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "pod2",
Annotations: map[string]string{
v1.TolerationsAnnotationKey: `
[{
"key": "dedicated",
"operator": "Equal",
"value": "user2",
"effect": "NoSchedule"
}]`,
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{{Image: "pod2:V1"}},
Containers: []v1.Container{{Image: "pod2:V1"}},
Tolerations: []v1.Toleration{{Key: "dedicated", Operator: "Equal", Value: "user2", Effect: "NoSchedule"}},
},
},
node: v1.Node{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TaintsAnnotationKey: `
[{
"key": "dedicated",
"value": "user1",
"effect": "NoSchedule"
}]`,
},
Spec: v1.NodeSpec{
Taints: []v1.Taint{{Key: "dedicated", Value: "user1", Effect: "NoSchedule"}},
},
},
fits: false,
@@ -3039,29 +3003,15 @@ func TestPodToleratesTaints(t *testing.T) {
pod: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "pod2",
Annotations: map[string]string{
v1.TolerationsAnnotationKey: `
[{
"key": "foo",
"operator": "Exists",
"effect": "NoSchedule"
}]`,
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{{Image: "pod2:V1"}},
Containers: []v1.Container{{Image: "pod2:V1"}},
Tolerations: []v1.Toleration{{Key: "foo", Operator: "Exists", Effect: "NoSchedule"}},
},
},
node: v1.Node{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TaintsAnnotationKey: `
[{
"key": "foo",
"value": "bar",
"effect": "NoSchedule"
}]`,
},
Spec: v1.NodeSpec{
Taints: []v1.Taint{{Key: "foo", Value: "bar", Effect: "NoSchedule"}},
},
},
fits: true,
@@ -3071,37 +3021,20 @@ func TestPodToleratesTaints(t *testing.T) {
pod: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "pod2",
Annotations: map[string]string{
v1.TolerationsAnnotationKey: `
[{
"key": "dedicated",
"operator": "Equal",
"value": "user2",
"effect": "NoSchedule"
}, {
"key": "foo",
"operator": "Exists",
"effect": "NoSchedule"
}]`,
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{{Image: "pod2:V1"}},
Tolerations: []v1.Toleration{
{Key: "dedicated", Operator: "Equal", Value: "user2", Effect: "NoSchedule"},
{Key: "foo", Operator: "Exists", Effect: "NoSchedule"},
},
},
},
node: v1.Node{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TaintsAnnotationKey: `
[{
"key": "dedicated",
"value": "user2",
"effect": "NoSchedule"
}, {
"key": "foo",
"value": "bar",
"effect": "NoSchedule"
}]`,
Spec: v1.NodeSpec{
Taints: []v1.Taint{
{Key: "dedicated", Value: "user2", Effect: "NoSchedule"},
{Key: "foo", Value: "bar", Effect: "NoSchedule"},
},
},
},
@@ -3112,29 +3045,16 @@ func TestPodToleratesTaints(t *testing.T) {
pod: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "pod2",
Annotations: map[string]string{
v1.TolerationsAnnotationKey: `
[{
"key": "foo",
"operator": "Equal",
"value": "bar",
"effect": "PreferNoSchedule"
}]`,
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{{Image: "pod2:V1"}},
Containers: []v1.Container{{Image: "pod2:V1"}},
Tolerations: []v1.Toleration{{Key: "foo", Operator: "Equal", Value: "bar", Effect: "PreferNoSchedule"}},
},
},
node: v1.Node{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TaintsAnnotationKey: `
[{
"key": "foo",
"value": "bar",
"effect": "NoSchedule"
}]`,
Spec: v1.NodeSpec{
Taints: []v1.Taint{
{Key: "foo", Value: "bar", Effect: "NoSchedule"},
},
},
},
@@ -3146,28 +3066,16 @@ func TestPodToleratesTaints(t *testing.T) {
pod: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "pod2",
Annotations: map[string]string{
v1.TolerationsAnnotationKey: `
[{
"key": "foo",
"operator": "Equal",
"value": "bar"
}]`,
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{{Image: "pod2:V1"}},
Containers: []v1.Container{{Image: "pod2:V1"}},
Tolerations: []v1.Toleration{{Key: "foo", Operator: "Equal", Value: "bar"}},
},
},
node: v1.Node{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TaintsAnnotationKey: `
[{
"key": "foo",
"value": "bar",
"effect": "NoSchedule"
}]`,
Spec: v1.NodeSpec{
Taints: []v1.Taint{
{Key: "foo", Value: "bar", Effect: "NoSchedule"},
},
},
},
@@ -3179,29 +3087,16 @@ func TestPodToleratesTaints(t *testing.T) {
pod: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "pod2",
Annotations: map[string]string{
v1.TolerationsAnnotationKey: `
[{
"key": "dedicated",
"operator": "Equal",
"value": "user2",
"effect": "NoSchedule"
}]`,
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{{Image: "pod2:V1"}},
Containers: []v1.Container{{Image: "pod2:V1"}},
Tolerations: []v1.Toleration{{Key: "dedicated", Operator: "Equal", Value: "user2", Effect: "NoSchedule"}},
},
},
node: v1.Node{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TaintsAnnotationKey: `
[{
"key": "dedicated",
"value": "user1",
"effect": "PreferNoSchedule"
}]`,
Spec: v1.NodeSpec{
Taints: []v1.Taint{
{Key: "dedicated", Value: "user1", Effect: "PreferNoSchedule"},
},
},
},
@@ -3219,14 +3114,9 @@ func TestPodToleratesTaints(t *testing.T) {
},
},
node: v1.Node{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TaintsAnnotationKey: `
[{
"key": "dedicated",
"value": "user1",
"effect": "PreferNoSchedule"
}]`,
Spec: v1.NodeSpec{
Taints: []v1.Taint{
{Key: "dedicated", Value: "user1", Effect: "PreferNoSchedule"},
},
},
},