Update tests.

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

View File

@@ -17,7 +17,6 @@ limitations under the License.
package priorities
import (
"encoding/json"
"reflect"
"testing"
@@ -43,7 +42,6 @@ func TestPriorityMetadata(t *testing.T) {
Value: "bar",
Effect: v1.TaintEffectPreferNoSchedule,
}}
tolerationData, _ := json.Marshal(tolerations)
podAffinity := &v1.Affinity{
PodAffinity: &v1.PodAffinity{
PreferredDuringSchedulingIgnoredDuringExecution: []v1.WeightedPodAffinityTerm{
@@ -66,11 +64,6 @@ func TestPriorityMetadata(t *testing.T) {
},
}
podWithTolerationsAndAffinity := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TolerationsAnnotationKey: string(tolerationData),
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{
{
@@ -79,15 +72,11 @@ func TestPriorityMetadata(t *testing.T) {
ImagePullPolicy: "Always",
},
},
Affinity: podAffinity,
Affinity: podAffinity,
Tolerations: tolerations,
},
}
podWithTolerationsAndRequests := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TolerationsAnnotationKey: string(tolerationData),
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{
{
@@ -102,6 +91,7 @@ func TestPriorityMetadata(t *testing.T) {
},
},
},
Tolerations: tolerations,
},
}
tests := []struct {