From b897981a11467fa54a59f111fd2e36d9906de62b Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Mon, 29 Feb 2016 14:35:54 -0800
Subject: [PATCH] Node e2e test - fix and re-enable readonly volume test. 
 Fixes #21320

---
 test/e2e_node/kubelet_test.go | 94 +++++++++++++++++------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/test/e2e_node/kubelet_test.go b/test/e2e_node/kubelet_test.go
index b041507b61ed0..5c12261e27df5 100644
--- a/test/e2e_node/kubelet_test.go
+++ b/test/e2e_node/kubelet_test.go
@@ -88,53 +88,53 @@ var _ = Describe("Kubelet", func() {
 			})
 		})
 
-		// TODO: Enable this when issues are resolved.  Tracked in #21320
-		//		Context("when scheduling a read only busybox container", func() {
-		//			It("it should return success", func() {
-		//				pod := &api.Pod{
-		//					ObjectMeta: api.ObjectMeta{
-		//						Name:      "busybox",
-		//						Namespace: api.NamespaceDefault,
-		//					},
-		//					Spec: api.PodSpec{
-		//						// Force the Pod to schedule to the node without a scheduler running
-		//						NodeName: *nodeName,
-		//						// Don't restart the Pod since it is expected to exit
-		//						RestartPolicy: api.RestartPolicyNever,
-		//						Containers: []api.Container{
-		//							{
-		//								Image:   "gcr.io/google_containers/busybox",
-		//								Name:    "busybox",
-		//								Command: []string{"sh", "-c", "echo test > /file"},
-		//								SecurityContext: &api.SecurityContext{
-		//									ReadOnlyRootFilesystem: &isReadOnly,
-		//								},
-		//							},
-		//						},
-		//					},
-		//				}
-		//				_, err := cl.Pods(api.NamespaceDefault).Create(pod)
-		//				Expect(err).To(BeNil(), fmt.Sprintf("Error creating Pod %v", err))
-		//			})
-		//
-		//			It("it should not write to the root filesystem", func() {
-		//				Eventually(func() string {
-		//					rc, err := cl.Pods(api.NamespaceDefault).GetLogs("busybox", &api.PodLogOptions{}).Stream()
-		//					if err != nil {
-		//						return ""
-		//					}
-		//					defer rc.Close()
-		//					buf := new(bytes.Buffer)
-		//					buf.ReadFrom(rc)
-		//					return buf.String()
-		//				}, time.Second*30, time.Second*4).Should(Equal("sh: can't create /file: Read-only file system"))
-		//			})
-		//
-		//			It("it should be possible to delete", func() {
-		//				err := cl.Pods(api.NamespaceDefault).Delete("busybox", &api.DeleteOptions{})
-		//				Expect(err).To(BeNil(), fmt.Sprintf("Error creating Pod %v", err))
-		//			})
-		//		})
+		Context("when scheduling a read only busybox container", func() {
+			It("it should return success", func() {
+				isReadOnly := true
+				pod := &api.Pod{
+					ObjectMeta: api.ObjectMeta{
+						Name:      "busybox",
+						Namespace: api.NamespaceDefault,
+					},
+					Spec: api.PodSpec{
+						// Force the Pod to schedule to the node without a scheduler running
+						NodeName: *nodeName,
+						// Don't restart the Pod since it is expected to exit
+						RestartPolicy: api.RestartPolicyNever,
+						Containers: []api.Container{
+							{
+								Image:   "gcr.io/google_containers/busybox",
+								Name:    "busybox",
+								Command: []string{"sh", "-c", "echo test > /file"},
+								SecurityContext: &api.SecurityContext{
+									ReadOnlyRootFilesystem: &isReadOnly,
+								},
+							},
+						},
+					},
+				}
+				_, err := cl.Pods(api.NamespaceDefault).Create(pod)
+				Expect(err).To(BeNil(), fmt.Sprintf("Error creating Pod %v", err))
+			})
+
+			It("it should not write to the root filesystem", func() {
+				Eventually(func() string {
+					rc, err := cl.Pods(api.NamespaceDefault).GetLogs("busybox", &api.PodLogOptions{}).Stream()
+					if err != nil {
+						return ""
+					}
+					defer rc.Close()
+					buf := new(bytes.Buffer)
+					buf.ReadFrom(rc)
+					return buf.String()
+				}, time.Second*30, time.Second*4).Should(Equal("sh: can't create /file: Read-only file system\n"))
+			})
+
+			It("it should be possible to delete", func() {
+				err := cl.Pods(api.NamespaceDefault).Delete("busybox", &api.DeleteOptions{})
+				Expect(err).To(BeNil(), fmt.Sprintf("Error creating Pod %v", err))
+			})
+		})
 	})
 
 	Describe("metrics api", func() {