From 77df3ff5254a0f2b4477b163d8de1baa4cfd034e Mon Sep 17 00:00:00 2001
From: David Zhu <dyzz@google.com>
Date: Wed, 13 Jun 2018 11:32:01 -0700
Subject: [PATCH] Added attach/mount/check steps to CSI Driver E2E tests

---
 pkg/volume/csi/csi_attacher.go  | 2 +-
 test/e2e/storage/csi_volumes.go | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/volume/csi/csi_attacher.go b/pkg/volume/csi/csi_attacher.go
index 82fb8e6620c..c22c061415a 100644
--- a/pkg/volume/csi/csi_attacher.go
+++ b/pkg/volume/csi/csi_attacher.go
@@ -135,7 +135,7 @@ func (c *csiAttacher) waitForVolumeAttachmentInternal(volumeHandle, attachID str
 	attach, err := c.k8s.StorageV1beta1().VolumeAttachments().Get(attachID, meta.GetOptions{})
 	if err != nil {
 		glog.Error(log("attacher.WaitForAttach failed for volume [%s] (will continue to try): %v", volumeHandle, err))
-		return "", err
+		return "", fmt.Errorf("volume %v has GET error for volume attachment %v: %v", volumeHandle, attachID, err)
 	}
 	// if being deleted, fail fast
 	if attach.GetDeletionTimestamp() != nil {
diff --git a/test/e2e/storage/csi_volumes.go b/test/e2e/storage/csi_volumes.go
index 82397eb008c..66019720989 100644
--- a/test/e2e/storage/csi_volumes.go
+++ b/test/e2e/storage/csi_volumes.go
@@ -132,6 +132,7 @@ func (h *hostpathCSIDriver) createStorageClassTest(node v1.Node) storageClassTes
 		claimSize:    "1Gi",
 		expectedSize: "1Gi",
 		nodeName:     node.Name,
+		attach:       true,
 	}
 }
 
@@ -197,6 +198,7 @@ func (g *gcePDCSIDriver) createStorageClassTest(node v1.Node) storageClassTest {
 		claimSize:    "5Gi",
 		expectedSize: "5Gi",
 		nodeName:     node.Name,
+		attach:       true,
 	}
 }