Merge pull request #19673 from ihmccreery/feature-volumes

test/e2e/persistent_volumes.go

@@ -28,10 +28,9 @@ import (
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 )
 
-// Marked with [Skipped] to skip the test by default (see driver.go),
-// the test needs privileged containers, which are disabled by default.
-// Run the test with "go run hack/e2e.go ... --ginkgo.focus=PersistentVolume"
-var _ = Describe("PersistentVolumes [Skipped]", func() {
+// This test needs privileged containers, which are disabled by default.  Run
+// the test with "go run hack/e2e.go ... --ginkgo.focus=[Feature:Volumes]"
+var _ = Describe("PersistentVolumes [Feature:Volumes]", func() {
 	framework := NewFramework("pv")
 	var c *client.Client
 	var ns string

test/e2e/volumes.go

@@ -326,10 +326,9 @@ func deleteCinderVolume(name string) error {
 	return err
 }
 
-// Marked with [Skipped] to skip the test by default (see driver.go),
-// these tests needs privileged containers, which are disabled by default.
-// Run the test with "go run hack/e2e.go ... --ginkgo.focus=Volume"
-var _ = Describe("Volumes [Skipped]", func() {
+// These tests need privileged containers, which are disabled by default.  Run
+// the test with "go run hack/e2e.go ... --ginkgo.focus=[Feature:Volumes]"
+var _ = Describe("Volumes [Feature:Volumes]", func() {
 	framework := NewFramework("volume")
 
 	// If 'false', the test won't clear its volumes upon completion. Useful for debugging,