From b68905b4e04644b69c95390cade839350fed9fec Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Wed, 3 Aug 2016 10:34:51 +0200 Subject: [PATCH] Reenable PodAffinity e2e tests --- test/e2e/scheduler_predicates.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/scheduler_predicates.go b/test/e2e/scheduler_predicates.go index 71b82fbbf6f..a9619d3c837 100644 --- a/test/e2e/scheduler_predicates.go +++ b/test/e2e/scheduler_predicates.go @@ -763,7 +763,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { }) // Test Nodes does not have any pod, hence it should be impossible to schedule a Pod with pod affinity. - It("validates that Inter-pod-Affinity is respected if not matching [Feature:PodAffinity]", func() { + It("validates that Inter-pod-Affinity is respected if not matching", func() { By("Trying to schedule Pod with nonempty Pod Affinity.") podName := "without-label-" + string(uuid.NewUUID()) @@ -810,7 +810,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { }) // test the pod affinity successful matching scenario. - It("validates that InterPodAffinity is respected if matching [Feature:PodAffinity]", func() { + It("validates that InterPodAffinity is respected if matching", func() { // launch a pod to find a node which can launch a pod. We intentionally do // not just take the node list and choose the first of them. Depending on the // cluster and the scheduler it might be that a "normal" pod cannot be @@ -896,7 +896,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { }) // test when the pod anti affinity rule is not satisfied, the pod would stay pending. - It("validates that InterPodAntiAffinity is respected if matching 2 [Feature:PodAffinity]", func() { + It("validates that InterPodAntiAffinity is respected if matching 2", func() { // launch a pod to find a node which can launch a pod. We intentionally do // not just take the node list and choose the first of them. Depending on the // cluster and the scheduler it might be that a "normal" pod cannot be @@ -980,7 +980,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { }) // test the pod affinity successful matching scenario with multiple Label Operators. - It("validates that InterPodAffinity is respected if matching with multiple Affinities [Feature:PodAffinity]", func() { + It("validates that InterPodAffinity is respected if matching with multiple Affinities", func() { // launch a pod to find a node which can launch a pod. We intentionally do // not just take the node list and choose the first of them. Depending on the // cluster and the scheduler it might be that a "normal" pod cannot be @@ -1074,7 +1074,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { }) // test the pod affinity and anti affinity successful matching scenario. - It("validates that InterPod Affinity and AntiAffinity is respected if matching [Feature:PodAffinity]", func() { + It("validates that InterPod Affinity and AntiAffinity is respected if matching", func() { // launch a pod to find a node which can launch a pod. We intentionally do // not just take the node list and choose the first of them. Depending on the // cluster and the scheduler it might be that a "normal" pod cannot be @@ -1171,7 +1171,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { }) // Verify that an escaped JSON string of pod affinity and pod anti affinity in a YAML PodSpec works. - It("validates that embedding the JSON PodAffinity and PodAntiAffinity setting as a string in the annotation value work [Feature:PodAffinity]", func() { + It("validates that embedding the JSON PodAffinity and PodAntiAffinity setting as a string in the annotation value work", func() { // launch a pod to find a node which can launch a pod. We intentionally do // not just take the node list and choose the first of them. Depending on the // cluster and the scheduler it might be that a "normal" pod cannot be