github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Make csi alpha failing test skip

Browse Source 
Fixes: #70760
This commit is contained in:
Masaki Kimura 2018-11-09 20:42:55 +00:00
parent 06e737367d
commit f98b87cac1
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/storage/testsuites/base.go
View File

@ -18,6 +18,7 @@ package testsuites
import ( import (
"fmt" "fmt"
"strings"
"time" "time"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
@ -324,3 +325,15 @@ func deleteStorageClass(cs clientset.Interface, className string) {
Expect(err).NotTo(HaveOccurred()) 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)
}
}

5
test/e2e/storage/testsuites/volumemode.go
View File

@ -76,6 +76,7 @@ func createVolumeModeTestInput(pattern testpatterns.TestPattern, resource volume
sc: resource.sc, sc: resource.sc,
pvc: resource.pvc, pvc: resource.pvc,
pv: resource.pv, pv: resource.pv,
driverName: dInfo.Name,
testVolType: pattern.VolType, testVolType: pattern.VolType,
nodeName: dInfo.Config.ClientNodeName, nodeName: dInfo.Config.ClientNodeName,
volMode: pattern.VolMode, volMode: pattern.VolMode,
@ -233,6 +234,7 @@ type volumeModeTestInput struct {
sc *storagev1.StorageClass sc *storagev1.StorageClass
pvc *v1.PersistentVolumeClaim pvc *v1.PersistentVolumeClaim
pv *v1.PersistentVolume pv *v1.PersistentVolume
driverName string
testVolType testpatterns.TestVolType testVolType testpatterns.TestVolType
nodeName string nodeName string
volMode v1.PersistentVolumeMode volMode v1.PersistentVolumeMode
@ -339,6 +341,9 @@ func testVolumeModeSuccessForDynamicPV(input *volumeModeTestInput) {
ns := f.Namespace ns := f.Namespace
var err error var err error
// TODO: This skip should be removed once #70760 is fixed
skipTestUntilBugfix("70760", input.driverName, []string{"csi-hostpath", "com.google.csi.gcepd"})
By("Creating sc") By("Creating sc")
input.sc, err = cs.StorageV1().StorageClasses().Create(input.sc) input.sc, err = cs.StorageV1().StorageClasses().Create(input.sc)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())