From 6ccbd3c9a905cdfbd085f53d74d1a8e012899a23 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Wed, 28 Oct 2020 15:34:35 -0700 Subject: [PATCH] Update PriorityClass conformance test to cover DeleteCollection --- test/e2e/scheduling/BUILD | 1 + test/e2e/scheduling/preemption.go | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test/e2e/scheduling/BUILD b/test/e2e/scheduling/BUILD index 5a355c35949..4676377f60d 100644 --- a/test/e2e/scheduling/BUILD +++ b/test/e2e/scheduling/BUILD @@ -58,6 +58,7 @@ go_library( "//test/e2e/framework/testfiles:go_default_library", "//test/utils:go_default_library", "//test/utils/image:go_default_library", + "//vendor/github.com/google/uuid:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", diff --git a/test/e2e/scheduling/preemption.go b/test/e2e/scheduling/preemption.go index 3215e1c081c..8cdf2e4d686 100644 --- a/test/e2e/scheduling/preemption.go +++ b/test/e2e/scheduling/preemption.go @@ -24,6 +24,7 @@ import ( "sync/atomic" "time" + "github.com/google/uuid" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" schedulingv1 "k8s.io/api/scheduling/v1" @@ -672,6 +673,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { ginkgo.Context("PriorityClass endpoints", func() { var cs clientset.Interface f := framework.NewDefaultFramework("sched-preemption-path") + testUUID := uuid.New().String() var pcs []*schedulingv1.PriorityClass ginkgo.BeforeEach(func() { @@ -679,7 +681,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { // Create 2 PriorityClass: p1, p2. for i := 1; i <= 2; i++ { name, val := fmt.Sprintf("p%d", i), int32(i) - pc, err := cs.SchedulingV1().PriorityClasses().Create(context.TODO(), &schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: name}, Value: val}, metav1.CreateOptions{}) + pc, err := cs.SchedulingV1().PriorityClasses().Create(context.TODO(), &schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: name, Labels: map[string]string{"e2e": testUUID}}, Value: val}, metav1.CreateOptions{}) if err != nil { framework.Logf("Failed to create priority '%v/%v'. Reason: %v. Msg: %v", name, val, apierrors.ReasonForError(err), err) } @@ -703,11 +705,9 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { } } - // Cannot run collection deletion which would delete all system level priority classes. - for _, pc := range pcs { - err := cs.SchedulingV1().PriorityClasses().Delete(context.TODO(), pc.Name, *metav1.NewDeleteOptions(0)) - framework.ExpectNoError(err) - } + // Collection deletion on created PriorityClasses. + err := cs.SchedulingV1().PriorityClasses().DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{LabelSelector: fmt.Sprintf("e2e=%v", testUUID)}) + framework.ExpectNoError(err) }) /*