Commit fff96848 authored by Davanum Srinivas's avatar Davanum Srinivas

A test we always skip should not be a conformance test

parent 865d3cf4
...@@ -38,7 +38,6 @@ test/e2e/common/container_probe.go: "should *not* be restarted with a exec \"cat ...@@ -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 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 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 *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 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 arguments (docker cmd) "
test/e2e/common/docker_containers.go: "should be able to override the image's default command (docker entrypoint) " test/e2e/common/docker_containers.go: "should be able to override the image's default command (docker entrypoint) "
......
...@@ -276,7 +276,7 @@ var _ = framework.KubeDescribe("Probing container", func() { ...@@ -276,7 +276,7 @@ var _ = framework.KubeDescribe("Probing container", func() {
Description: Make sure that the pod is restarted with a docker exec Description: Make sure that the pod is restarted with a docker exec
liveness probe with timeout. 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. // 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") 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{ runLivenessTest(f, &v1.Pod{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment