From b275ebb5a8ed823655f35463d0e4725dcdea251c Mon Sep 17 00:00:00 2001
From: Cheng Xing <cxing@google.com>
Date: Wed, 14 Nov 2018 18:20:22 -0800
Subject: [PATCH] Revert "Make csi alpha failing test skip"

This reverts commit f98b87cac1b25e38ef7c784071c85794204cfee8.
---
 test/e2e/storage/testsuites/base.go       | 13 -------------
 test/e2e/storage/testsuites/volumemode.go |  5 -----
 2 files changed, 18 deletions(-)

diff --git a/test/e2e/storage/testsuites/base.go b/test/e2e/storage/testsuites/base.go
index b96aa5b988b..8d4f084989f 100644
--- a/test/e2e/storage/testsuites/base.go
+++ b/test/e2e/storage/testsuites/base.go
@@ -18,7 +18,6 @@ package testsuites
 
 import (
 	"fmt"
-	"strings"
 	"time"
 
 	. "github.com/onsi/ginkgo"
@@ -325,15 +324,3 @@ func deleteStorageClass(cs clientset.Interface, className string) {
 		Expect(err).NotTo(HaveOccurred())
 	}
 }
-
-func skipTestUntilBugfix(issueID string, driverName string, prefixes []string) {
-	var needSkip bool
-	for _, prefix := range prefixes {
-		if strings.HasPrefix(driverName, prefix) {
-			needSkip = true
-		}
-	}
-	if needSkip {
-		framework.Skipf("Due to issue #%s, this test with %s doesn't pass, skipping until it fixes", issueID, driverName)
-	}
-}
diff --git a/test/e2e/storage/testsuites/volumemode.go b/test/e2e/storage/testsuites/volumemode.go
index 6785fc60851..360097b66f2 100644
--- a/test/e2e/storage/testsuites/volumemode.go
+++ b/test/e2e/storage/testsuites/volumemode.go
@@ -76,7 +76,6 @@ func createVolumeModeTestInput(pattern testpatterns.TestPattern, resource volume
 		sc:               resource.sc,
 		pvc:              resource.pvc,
 		pv:               resource.pv,
-		driverName:       dInfo.Name,
 		testVolType:      pattern.VolType,
 		nodeName:         dInfo.Config.ClientNodeName,
 		volMode:          pattern.VolMode,
@@ -234,7 +233,6 @@ type volumeModeTestInput struct {
 	sc               *storagev1.StorageClass
 	pvc              *v1.PersistentVolumeClaim
 	pv               *v1.PersistentVolume
-	driverName       string
 	testVolType      testpatterns.TestVolType
 	nodeName         string
 	volMode          v1.PersistentVolumeMode
@@ -341,9 +339,6 @@ func testVolumeModeSuccessForDynamicPV(input *volumeModeTestInput) {
 		ns := f.Namespace
 		var err error
 
-		// TODO: This skip should be removed once #70760 is fixed
-		skipTestUntilBugfix("70760", input.driverName, []string{"pd.csi.storage.gke.io"})
-
 		By("Creating sc")
 		input.sc, err = cs.StorageV1().StorageClasses().Create(input.sc)
 		Expect(err).NotTo(HaveOccurred())