Skip to content

Commit

Permalink
Reenable PodAffinity e2e tests
Browse files Browse the repository at this point in the history
  • Loading branch information
wojtek-t committed Aug 3, 2016
1 parent 022719b commit b68905b
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions test/e2e/scheduler_predicates.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b68905b

Please sign in to comment.