Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

relabel NodeAffinity tests with :alpha conformance subclass #20725

Merged
merged 1 commit into from
Feb 9, 2016
Merged

relabel NodeAffinity tests with :alpha conformance subclass #20725

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions test/e2e/scheduler_predicates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ var _ = Describe("SchedulerPredicates [Serial]", func() {
cleanupPods(c, ns)
})

It("validates that a pod with an invalid Affinity is rejected [Conformance]", func() {
It("validates that a pod with an invalid NodeAffinity is rejected [Feature:NodeAffinity]", func() {

By("Trying to launch a pod with an invalid Affinity data.")
podName := "without-label"
Expand Down Expand Up @@ -519,7 +519,7 @@ var _ = Describe("SchedulerPredicates [Serial]", func() {

// Test Nodes does not have any label, hence it should be impossible to schedule Pod with
// non-nil NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.
It("validates that NodeAffinity is respected if not matching [Conformance]", func() {
It("validates that NodeAffinity is respected if not matching [Feature:NodeAffinity]", func() {
By("Trying to schedule Pod with nonempty NodeSelector.")
podName := "restricted-pod"

Expand Down Expand Up @@ -575,7 +575,7 @@ var _ = Describe("SchedulerPredicates [Serial]", func() {

// Keep the same steps with the test on NodeSelector,
// but specify Affinity in Pod.Annotations, instead of NodeSelector.
It("validates that required NodeAffinity setting is respected if matching [Conformance]", func() {
It("validates that required NodeAffinity setting is respected if matching [Feature:NodeAffinity]", 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 @@ -669,7 +669,7 @@ var _ = Describe("SchedulerPredicates [Serial]", func() {
})

// Verify that an escaped JSON string of NodeAffinity in a YAML PodSpec works.
It("validates that embedding the JSON NodeAffinity setting as a string in the annotation value work [Conformance]", func() {
It("validates that embedding the JSON NodeAffinity setting as a string in the annotation value work [Feature:NodeAffinity]", 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