test/e2e/common: promote container probe exec timeout tests to conformanec

Signed-off-by: Andrew Sy Kim <kim.andrewsy@gmail.com>
This commit is contained in:
Andrew Sy Kim 2020-12-30 15:22:50 -05:00
parent 36bde432ad
commit af3e118b1f

View File

@ -210,10 +210,10 @@ var _ = framework.KubeDescribe("Probing container", func() {
/* /*
Release: v1.9 Release: v1.9
Testname: Pod liveness probe, docker exec, restart Testname: Pod liveness probe, container exec timeout, restart
Description: A Pod is created with liveness probe with a Exec action on the Pod. If the liveness probe call does not return within the timeout specified, liveness probe MUST restart the Pod. Description: A Pod is created with liveness probe with a Exec action on the Pod. If the liveness probe call does not return within the timeout specified, liveness probe MUST restart the Pod.
*/ */
ginkgo.It("should be restarted with an exec liveness probe with timeout [NodeConformance]", func() { framework.ConformanceIt("should be restarted with an exec liveness probe with timeout [NodeConformance]", func() {
cmd := []string{"/bin/sh", "-c", "sleep 600"} cmd := []string{"/bin/sh", "-c", "sleep 600"}
livenessProbe := &v1.Probe{ livenessProbe := &v1.Probe{
Handler: execHandler([]string{"/bin/sh", "-c", "sleep 10"}), Handler: execHandler([]string{"/bin/sh", "-c", "sleep 10"}),
@ -227,10 +227,10 @@ var _ = framework.KubeDescribe("Probing container", func() {
/* /*
Release: v1.20 Release: v1.20
Testname: Pod readiness probe, docker exec, not ready Testname: Pod readiness probe, container exec timeout, not ready
Description: A Pod is created with readiness probe with a Exec action on the Pod. If the readiness probe call does not return within the timeout specified, readiness probe MUST not be Ready. Description: A Pod is created with readiness probe with a Exec action on the Pod. If the readiness probe call does not return within the timeout specified, readiness probe MUST not be Ready.
*/ */
ginkgo.It("should not be ready with an exec readiness probe timeout [NodeConformance]", func() { framework.ConformanceIt("should not be ready with an exec readiness probe timeout [NodeConformance]", func() {
cmd := []string{"/bin/sh", "-c", "sleep 600"} cmd := []string{"/bin/sh", "-c", "sleep 600"}
readinessProbe := &v1.Probe{ readinessProbe := &v1.Probe{
Handler: execHandler([]string{"/bin/sh", "-c", "sleep 10"}), Handler: execHandler([]string{"/bin/sh", "-c", "sleep 10"}),