From d46c56f3842ccbdcfe4bdb7ceaf876148da97071 Mon Sep 17 00:00:00 2001 From: pontiyaraja Date: Tue, 19 Mar 2019 15:14:54 +0530 Subject: [PATCH] promote should be submitted and removed e2e test case to conformance --- test/conformance/testdata/conformance.txt | 1 + test/e2e/node/pods.go | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index 8ce92e5ef19..1c90651dbde 100644 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -191,6 +191,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/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 d5e41404f83..2640cca3298 100644 --- a/test/e2e/node/pods.go +++ b/test/e2e/node/pods.go @@ -46,13 +46,13 @@ var _ = SIGDescribe("Pods Extended", func() { BeforeEach(func() { podClient = f.PodClient() }) - // TODO: Fix Flaky issue #68066 and then re-add this back into Conformance Suite + /* - Release : v1.9 + Release : v1.15 Testname: Pods, delete grace period - Description: Create a pod, make sure it is running, create a watch to observe Pod creation. Create a 'kubectl local proxy', capture the port the proxy is listening. Using the http client send a ‘delete’ with gracePeriodSeconds=30. Pod SHOULD get deleted within 30 seconds. + Description: Create a pod, make sure it is running. Create a 'kubectl local proxy', capture the port the proxy is listening. Using the http client send a ‘delete’ with gracePeriodSeconds=30. Pod SHOULD get deleted within 30 seconds. */ - It("should be submitted and removed [Flaky]", func() { + framework.ConformanceIt("should be submitted and removed", func() { By("creating the pod") name := "pod-submit-remove-" + string(uuid.NewUUID()) value := strconv.Itoa(time.Now().Nanosecond())