github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #83381 from davidz627/fix/blockFail

Browse Source 
Run block tests for gce-pd csi driver. Improve skip block test function name
This commit is contained in:
Kubernetes Prow Robot 2019-10-01 20:03:06 -07:00 committed by GitHub
commit e31cc95276
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/storage/drivers/csi.go
View File

@ -393,6 +393,7 @@ func InitGcePDCSIDriver() testsuites.TestDriver {
testsuites.CapFsGroup: true, testsuites.CapFsGroup: true,
testsuites.CapExec: true, testsuites.CapExec: true,
testsuites.CapMultiPODs: true, testsuites.CapMultiPODs: true,
testsuites.CapBlock: true,
// GCE supports volume limits, but the test creates large // GCE supports volume limits, but the test creates large
// number of volumes and times out test suites. // number of volumes and times out test suites.
testsuites.CapVolumeLimits: false, testsuites.CapVolumeLimits: false,

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

@ -275,7 +275,7 @@ func (t *volumeModeTestSuite) defineTests(driver TestDriver, pattern testpattern
} }
ginkgo.It("should fail to use a volume in a pod with mismatched mode [Slow]", func() { ginkgo.It("should fail to use a volume in a pod with mismatched mode [Slow]", func() {
skipBlockTest(driver) skipTestIfBlockNotSupported(driver)
init() init()
l.genericVolumeTestResource = *createGenericVolumeTestResource(driver, l.config, pattern) l.genericVolumeTestResource = *createGenericVolumeTestResource(driver, l.config, pattern)
defer cleanup() defer cleanup()
@ -324,7 +324,7 @@ func (t *volumeModeTestSuite) defineTests(driver TestDriver, pattern testpattern
framework.SkipUnlessProviderIs(framework.ProvidersWithSSH...) framework.SkipUnlessProviderIs(framework.ProvidersWithSSH...)
framework.SkipUnlessSSHKeyPresent() framework.SkipUnlessSSHKeyPresent()
if pattern.VolMode == v1.PersistentVolumeBlock { if pattern.VolMode == v1.PersistentVolumeBlock {
skipBlockTest(driver) skipTestIfBlockNotSupported(driver)
} }
init() init()
l.genericVolumeTestResource = *createGenericVolumeTestResource(driver, l.config, pattern) l.genericVolumeTestResource = *createGenericVolumeTestResource(driver, l.config, pattern)

4
test/e2e/storage/testsuites/volumes.go
View File

@ -89,7 +89,7 @@ func skipExecTest(driver TestDriver) {
} }
} }
func skipBlockTest(driver TestDriver) { func skipTestIfBlockNotSupported(driver TestDriver) {
dInfo := driver.GetDriverInfo() dInfo := driver.GetDriverInfo()
if !dInfo.Capabilities[CapBlock] { if !dInfo.Capabilities[CapBlock] {
framework.Skipf("Driver %q does not provide raw block - skipping", dInfo.Name) framework.Skipf("Driver %q does not provide raw block - skipping", dInfo.Name)
@ -145,7 +145,7 @@ func (t *volumesTestSuite) defineTests(driver TestDriver, pattern testpatterns.T
ginkgo.It("should store data", func() { ginkgo.It("should store data", func() {
if pattern.VolMode == v1.PersistentVolumeBlock { if pattern.VolMode == v1.PersistentVolumeBlock {
skipBlockTest(driver) skipTestIfBlockNotSupported(driver)
} }
init() init()