diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index 526498446cd..7f5af238663 100644 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -207,7 +207,7 @@ test/e2e/network/service.go: "should serve multiport endpoints from pods" test/e2e/network/service_latency.go: "should not be very high" test/e2e/node/events.go: "should be sent by kubelets and the scheduler about pods scheduling and running" test/e2e/node/pods.go: "should be submitted and removed" -test/e2e/node/pods.go: "should be submitted and removed" +test/e2e/node/pods.go: "should be set on Pods with matching resource requests and limits for memory and cpu" test/e2e/node/pre_stop.go: "should call prestop when killing a pod" test/e2e/scheduling/predicates.go: "validates resource limits of pods that are allowed to run" test/e2e/scheduling/predicates.go: "validates that NodeSelector is respected if not matching" diff --git a/test/e2e/node/pods.go b/test/e2e/node/pods.go index 0da38f59362..e8174ee1878 100644 --- a/test/e2e/node/pods.go +++ b/test/e2e/node/pods.go @@ -25,7 +25,7 @@ import ( "strconv" "time" - v1 "k8s.io/api/core/v1" + "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -179,12 +179,13 @@ var _ = SIGDescribe("Pods Extended", func() { ginkgo.BeforeEach(func() { podClient = f.PodClient() }) + /* Release : v1.9 Testname: Pods, QOS - Description: Create a Pod with CPU and Memory request and limits. Pos status MUST have QOSClass set to PodQOSGuaranteed. + Description: Create a Pod with CPU and Memory request and limits. Pod status MUST have QOSClass set to PodQOSGuaranteed. */ - framework.ConformanceIt("should be submitted and removed ", func() { + framework.ConformanceIt("should be set on Pods with matching resource requests and limits for memory and cpu", func() { ginkgo.By("creating the pod") name := "pod-qos-class-" + string(uuid.NewUUID()) pod := &v1.Pod{