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

Run block tests for gce-pd csi driver. Improve skip block test function name

Browse Source
This commit is contained in:
David Zhu 2019-10-01 15:20:12 -07:00
parent 75321b99ec
commit 8ff56a50a2
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.CapExec: true,
testsuites.CapMultiPODs: true,
testsuites.CapBlock: true,
// GCE supports volume limits, but the test creates large
// number of volumes and times out test suites.
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() {
skipBlockTest(driver)
skipTestIfBlockNotSupported(driver)
init()
l.genericVolumeTestResource = *createGenericVolumeTestResource(driver, l.config, pattern)
defer cleanup()
@ -324,7 +324,7 @@ func (t *volumeModeTestSuite) defineTests(driver TestDriver, pattern testpattern
framework.SkipUnlessProviderIs(framework.ProvidersWithSSH...)
framework.SkipUnlessSSHKeyPresent()
if pattern.VolMode == v1.PersistentVolumeBlock {
skipBlockTest(driver)
skipTestIfBlockNotSupported(driver)
}
init()
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()
if !dInfo.Capabilities[CapBlock] {
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() {
if pattern.VolMode == v1.PersistentVolumeBlock {
skipBlockTest(driver)
skipTestIfBlockNotSupported(driver)
}
init()