From c968beceb1adbcae15ff173f54e5d286423bc068 Mon Sep 17 00:00:00 2001
From: Matthew Wong <mawong@redhat.com>
Date: Tue, 10 Jul 2018 16:16:37 -0400
Subject: [PATCH] Re-enable write-read pv check in volume provisioning tests

---
 test/e2e/storage/csi_volumes.go         |  2 --
 test/e2e/storage/volume_provisioning.go | 43 +++++++++++++------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/test/e2e/storage/csi_volumes.go b/test/e2e/storage/csi_volumes.go
index 66019720989..82397eb008c 100644
--- a/test/e2e/storage/csi_volumes.go
+++ b/test/e2e/storage/csi_volumes.go
@@ -132,7 +132,6 @@ func (h *hostpathCSIDriver) createStorageClassTest(node v1.Node) storageClassTes
 		claimSize:    "1Gi",
 		expectedSize: "1Gi",
 		nodeName:     node.Name,
-		attach:       true,
 	}
 }
 
@@ -198,7 +197,6 @@ func (g *gcePDCSIDriver) createStorageClassTest(node v1.Node) storageClassTest {
 		claimSize:    "5Gi",
 		expectedSize: "5Gi",
 		nodeName:     node.Name,
-		attach:       true,
 	}
 }
 
diff --git a/test/e2e/storage/volume_provisioning.go b/test/e2e/storage/volume_provisioning.go
index c87d6420276..d2a91883fb9 100644
--- a/test/e2e/storage/volume_provisioning.go
+++ b/test/e2e/storage/volume_provisioning.go
@@ -48,16 +48,16 @@ import (
 )
 
 type storageClassTest struct {
-	name           string
-	cloudProviders []string
-	provisioner    string
-	parameters     map[string]string
-	claimSize      string
-	expectedSize   string
-	pvCheck        func(volume *v1.PersistentVolume) error
-	nodeName       string
-	attach         bool
-	volumeMode     *v1.PersistentVolumeMode
+	name               string
+	cloudProviders     []string
+	provisioner        string
+	parameters         map[string]string
+	claimSize          string
+	expectedSize       string
+	pvCheck            func(volume *v1.PersistentVolume) error
+	nodeName           string
+	skipWriteReadCheck bool
+	volumeMode         *v1.PersistentVolumeMode
 }
 
 const (
@@ -132,7 +132,7 @@ func testDynamicProvisioning(t storageClassTest, client clientset.Interface, cla
 		Expect(err).NotTo(HaveOccurred())
 	}
 
-	if t.attach {
+	if !t.skipWriteReadCheck {
 		// We start two pods:
 		// - The first writes 'hello word' to the /mnt/test (= the volume).
 		// - The second one runs grep 'hello world' on /mnt/test.
@@ -796,12 +796,12 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() {
 			serverUrl := "https://" + pod.Status.PodIP + ":8081"
 			By("creating a StorageClass")
 			test := storageClassTest{
-				name:         "Gluster Dynamic provisioner test",
-				provisioner:  "kubernetes.io/glusterfs",
-				claimSize:    "2Gi",
-				expectedSize: "2Gi",
-				parameters:   map[string]string{"resturl": serverUrl},
-				attach:       false,
+				name:               "Gluster Dynamic provisioner test",
+				provisioner:        "kubernetes.io/glusterfs",
+				claimSize:          "2Gi",
+				expectedSize:       "2Gi",
+				parameters:         map[string]string{"resturl": serverUrl},
+				skipWriteReadCheck: true,
 			}
 
 			// GCE/GKE
@@ -833,10 +833,11 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() {
 			By("creating a claim with default class")
 			block := v1.PersistentVolumeBlock
 			test := storageClassTest{
-				name:         "default",
-				claimSize:    "2Gi",
-				expectedSize: "2Gi",
-				volumeMode:   &block,
+				name:               "default",
+				claimSize:          "2Gi",
+				expectedSize:       "2Gi",
+				volumeMode:         &block,
+				skipWriteReadCheck: true,
 			}
 			// gce or gke
 			if getDefaultPluginName() == "kubernetes.io/gce-pd" {