From 78a15ed1c9121be7e8d084bf347aabe079b68340 Mon Sep 17 00:00:00 2001
From: Mayank Gaikwad <8110509+mgdevstack@users.noreply.github.com>
Date: Sun, 30 Sep 2018 21:38:41 +0530
Subject: [PATCH] Promote pod's websocket based NodeConformance tests to
 Conformance

---
 test/conformance/testdata/conformance.txt |  2 ++
 test/e2e/common/pods.go                   | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt
index 188c159fe5..deb200c6bb 100755
--- a/test/conformance/testdata/conformance.txt
+++ b/test/conformance/testdata/conformance.txt
@@ -106,6 +106,8 @@ test/e2e/common/pods.go: "should be submitted and removed"
 test/e2e/common/pods.go: "should be updated"
 test/e2e/common/pods.go: "should allow activeDeadlineSeconds to be updated"
 test/e2e/common/pods.go: "should contain environment variables for services"
+test/e2e/common/pods.go: "should support remote command execution over websockets"
+test/e2e/common/pods.go: "should support retrieving logs from the container over websockets"
 test/e2e/common/projected.go: "should be consumable from pods in volume"
 test/e2e/common/projected.go: "should be consumable from pods in volume with defaultMode set"
 test/e2e/common/projected.go: "should be consumable from pods in volume as non-root with defaultMode and fsGroup set"
diff --git a/test/e2e/common/pods.go b/test/e2e/common/pods.go
index 214a908081..b420e1e69a 100644
--- a/test/e2e/common/pods.go
+++ b/test/e2e/common/pods.go
@@ -472,7 +472,13 @@ var _ = framework.KubeDescribe("Pods", func() {
 		}, maxRetries, "Container should have service environment variables set")
 	})
 
-	It("should support remote command execution over websockets [NodeConformance]", func() {
+	/*
+		Release : v1.13
+		Testname: Pods, remote command execution over websocket
+		Description: A Pod is created. Websocket is created to retrieve exec command output from this pod.
+		Message retrieved form Websocket MUST match with expected exec command output.
+	*/
+	framework.ConformanceIt("should support remote command execution over websockets [NodeConformance]", func() {
 		config, err := framework.LoadConfig()
 		Expect(err).NotTo(HaveOccurred(), "unable to get base config")
 
@@ -548,7 +554,13 @@ var _ = framework.KubeDescribe("Pods", func() {
 		}, time.Minute, 10*time.Second).Should(BeNil())
 	})
 
-	It("should support retrieving logs from the container over websockets [NodeConformance]", func() {
+	/*
+		Release : v1.13
+		Testname: Pods, logs from websockets
+		Description: A Pod is created. Websocket is created to retrieve log of a container from this pod.
+		Message retrieved form Websocket MUST match with container's output.
+	*/
+	framework.ConformanceIt("should support retrieving logs from the container over websockets [NodeConformance]", func() {
 		config, err := framework.LoadConfig()
 		Expect(err).NotTo(HaveOccurred(), "unable to get base config")