Fix integration test

kubernetes-sigs · Dec 21, 2018 · b56ea8e · b56ea8e
1 parent 8f522f1
commit b56ea8e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/pkg/cloud/cloud.go b/pkg/cloud/cloud.go
@@ -521,7 +521,7 @@ func (c *cloud) waitForVolume(ctx context.Context, volumeID string) error {
 			case "available":
 				return true, nil
 			case "creating":
-				return false, fmt.Errorf("volume %s is still being created", volumeID)
+				return false, nil
 			default:
 				return true, fmt.Errorf("unexpected state for volume %s: %q", volumeID, *vol.State)
 			}

diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go
@@ -79,7 +79,9 @@ var _ = Describe("EBS CSI Driver", func() {
 		}()
 
 		// Attach, stage, publish, unpublish, unstage, detach
-		nodeID := ebs.GetMetadata().GetInstanceID()
+		metadata, err := newMetadata()
+		Expect(err).To(BeNil())
+		nodeID := metadata.GetInstanceID()
 		testAttachWriteReadDetach(volume.VolumeId, req.GetName(), nodeID, false)
 
 	})

diff --git a/tests/integration/setup_test.go b/tests/integration/setup_test.go
@@ -42,7 +42,6 @@ var (
 	drv       *driver.Driver
 	csiClient *CSIClient
 	ec2Client *ec2.EC2
-	ebs       cloud.Cloud
 )
 
 func TestIntegration(t *testing.T) {