diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index f5ff023055b..7c2fb28ba8f 100755 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -38,7 +38,6 @@ test/e2e/common/container_probe.go: "should *not* be restarted with a exec \"cat test/e2e/common/container_probe.go: "should be restarted with a /healthz http liveness probe " test/e2e/common/container_probe.go: "should have monotonically increasing restart count [Slow]" test/e2e/common/container_probe.go: "should *not* be restarted with a /healthz http liveness probe " -test/e2e/common/container_probe.go: "should be restarted with a docker exec liveness probe with timeout " test/e2e/common/docker_containers.go: "should use the image defaults if command and args are blank " test/e2e/common/docker_containers.go: "should be able to override the image's default arguments (docker cmd) " test/e2e/common/docker_containers.go: "should be able to override the image's default command (docker entrypoint) " diff --git a/test/e2e/common/container_probe.go b/test/e2e/common/container_probe.go index ef0fedb95f6..1cd53c07bd8 100644 --- a/test/e2e/common/container_probe.go +++ b/test/e2e/common/container_probe.go @@ -276,7 +276,7 @@ var _ = framework.KubeDescribe("Probing container", func() { Description: Make sure that the pod is restarted with a docker exec liveness probe with timeout. */ - framework.ConformanceIt("should be restarted with a docker exec liveness probe with timeout ", func() { + It("should be restarted with a docker exec liveness probe with timeout ", func() { // TODO: enable this test once the default exec handler supports timeout. framework.Skipf("The default exec handler, dockertools.NativeExecHandler, does not support timeouts due to a limitation in the Docker Remote API") runLivenessTest(f, &v1.Pod{