From 0c671b121164e5bd79210c03c60a979bc8e09cc9 Mon Sep 17 00:00:00 2001 From: Matthew Wong Date: Fri, 13 Jul 2018 13:52:40 -0400 Subject: [PATCH] Remove [Feature:BlockVolume] everywhere --- test/e2e/storage/persistent_volumes-local.go | 6 +----- test/e2e/storage/testsuites/provisioning.go | 2 +- test/e2e/storage/testsuites/volumemode.go | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/test/e2e/storage/persistent_volumes-local.go b/test/e2e/storage/persistent_volumes-local.go index 102660bc57a..aa55bf287d6 100644 --- a/test/e2e/storage/persistent_volumes-local.go +++ b/test/e2e/storage/persistent_volumes-local.go @@ -218,11 +218,7 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() { if testVolType == GCELocalSSDVolumeType { serialStr = " [Serial]" } - alphaStr := "" - if testVolType == BlockLocalVolumeType { - alphaStr = " [Feature:BlockVolume]" - } - ctxString := fmt.Sprintf("[Volume type: %s]%v%v", testVolType, serialStr, alphaStr) + ctxString := fmt.Sprintf("[Volume type: %s]%v", testVolType, serialStr) testMode := immediateMode Context(ctxString, func() { diff --git a/test/e2e/storage/testsuites/provisioning.go b/test/e2e/storage/testsuites/provisioning.go index f3df98ae8d7..70c3ad0e3cf 100644 --- a/test/e2e/storage/testsuites/provisioning.go +++ b/test/e2e/storage/testsuites/provisioning.go @@ -186,7 +186,7 @@ func testProvisioning(input *provisioningTestInput) { TestDynamicProvisioning(input.testCase, input.cs, input.pvc, input.sc) }) - It("should create and delete block persistent volumes [Feature:BlockVolume]", func() { + It("should create and delete block persistent volumes", func() { if !input.dInfo.IsBlockSupported { framework.Skipf("Driver %q does not support BlockVolume - skipping", input.dInfo.Name) } diff --git a/test/e2e/storage/testsuites/volumemode.go b/test/e2e/storage/testsuites/volumemode.go index 6785fc60851..d016f796196 100644 --- a/test/e2e/storage/testsuites/volumemode.go +++ b/test/e2e/storage/testsuites/volumemode.go @@ -47,8 +47,7 @@ var _ TestSuite = &volumeModeTestSuite{} func InitVolumeModeTestSuite() TestSuite { return &volumeModeTestSuite{ tsInfo: TestSuiteInfo{ - name: "volumeMode", - featureTag: "[Feature:BlockVolume]", + name: "volumeMode", testPatterns: []testpatterns.TestPattern{ testpatterns.FsVolModePreprovisionedPV, testpatterns.FsVolModeDynamicPV,