Promote a TCP probe test to Conformance

kubernetes · Nov 21, 2019 · 3cbc07b · 3cbc07b
1 parent 3c5dad6
commit 3cbc07b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt
@@ -103,6 +103,7 @@ test/e2e/common/container_probe.go: "with readiness probe that fails should neve
 test/e2e/common/container_probe.go: "should be restarted with a exec \\\"cat /tmp/health\\\" liveness probe"
 test/e2e/common/container_probe.go: "should *not* be restarted with a exec \\\"cat /tmp/health\\\" liveness probe"
 test/e2e/common/container_probe.go: "should be restarted with a /healthz http liveness probe"
+test/e2e/common/container_probe.go: "should *not* be restarted with a tcp:8080 liveness probe"
 test/e2e/common/container_probe.go: "should have monotonically increasing restart count"
 test/e2e/common/container_probe.go: "should *not* be restarted with a /healthz http liveness probe"
 test/e2e/common/docker_containers.go: "should use the image defaults if command and args are blank"

diff --git a/test/e2e/common/container_probe.go b/test/e2e/common/container_probe.go
@@ -159,11 +159,11 @@ var _ = framework.KubeDescribe("Probing container", func() {
 	})
 
 	/*
-		Release : v1.15
+		Release : v1.18
 		Testname: Pod liveness probe, using tcp socket, no restart
-		Description: A Pod is created with liveness probe on tcp socket 8080. The http handler on port 8080 will return http errors after 10 seconds, but socket will remain open. Liveness probe MUST not fail to check health and the restart count should remain 0.
+		Description: A Pod is created with liveness probe on tcp socket 8080. The http handler on port 8080 will return http errors after 10 seconds, but the socket will remain open. Liveness probe MUST not fail to check health and the restart count should remain 0.
 	*/
-	ginkgo.It("should *not* be restarted with a tcp:8080 liveness probe [NodeConformance]", func() {
+	framework.ConformanceIt("should *not* be restarted with a tcp:8080 liveness probe [NodeConformance]", func() {
 		livenessProbe := &v1.Probe{
 			Handler:             tcpSocketHandler(8080),
 			InitialDelaySeconds: 15,