Skip to content

K
k3s
Commit a040c9f1 authored by Jeff Vance's avatar Jeff Vance
Browse files
Options

Apply [Feature:Volumes] to subset of tests in volumes.go

parent b4c71b1f
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 16 deletions
test/e2e/volumes.go
View file @ a040c9f1
...@@ -381,9 +381,8 @@ func deleteCinderVolume(name string) error { ...@@ -381,9 +381,8 @@ func deleteCinderVolume(name string) error {
return err return err
} }
// These tests need privileged containers, which are disabled by default. Run // These tests need privileged containers, which are disabled by default.
// the test with "go run hack/e2e.go ... --ginkgo.focus=[Feature:Volumes]" var _ = framework.KubeDescribe("Volumes [Volume]", func() {
var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
f := framework.NewDefaultFramework("volume") f := framework.NewDefaultFramework("volume")
// If 'false', the test won't clear its volumes upon completion. Useful for debugging, // If 'false', the test won't clear its volumes upon completion. Useful for debugging,
...@@ -403,7 +402,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() { ...@@ -403,7 +402,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("NFS", func() { framework.KubeDescribe("NFS", func() {
It("should be mountable [Volume]", func() { It("should be mountable", func() {
config := VolumeTestConfig{ config := VolumeTestConfig{
namespace: namespace.Name, namespace: namespace.Name,
prefix: "nfs", prefix: "nfs",
...@@ -442,8 +441,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() { ...@@ -442,8 +441,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
// Gluster // Gluster
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("GlusterFS", func() { framework.KubeDescribe("GlusterFS [Feature:Volumes]", func() {
It("should be mountable [Volume]", func() { It("should be mountable", func() {
config := VolumeTestConfig{ config := VolumeTestConfig{
namespace: namespace.Name, namespace: namespace.Name,
prefix: "gluster", prefix: "gluster",
...@@ -527,8 +526,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() { ...@@ -527,8 +526,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
// are installed on all nodes! // are installed on all nodes!
// Run the test with "go run hack/e2e.go ... --ginkgo.focus=iSCSI" // Run the test with "go run hack/e2e.go ... --ginkgo.focus=iSCSI"
framework.KubeDescribe("iSCSI", func() { framework.KubeDescribe("iSCSI [Feature:Volumes]", func() {
It("should be mountable [Volume]", func() { It("should be mountable", func() {
config := VolumeTestConfig{ config := VolumeTestConfig{
namespace: namespace.Name, namespace: namespace.Name,
prefix: "iscsi", prefix: "iscsi",
...@@ -574,8 +573,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() { ...@@ -574,8 +573,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
// Ceph RBD // Ceph RBD
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("Ceph RBD", func() { framework.KubeDescribe("Ceph RBD [Feature:Volumes]", func() {
It("should be mountable [Volume]", func() { It("should be mountable", func() {
config := VolumeTestConfig{ config := VolumeTestConfig{
namespace: namespace.Name, namespace: namespace.Name,
prefix: "rbd", prefix: "rbd",
...@@ -652,8 +651,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() { ...@@ -652,8 +651,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
// Ceph // Ceph
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("CephFS", func() { framework.KubeDescribe("CephFS [Feature:Volumes]", func() {
It("should be mountable [Volume]", func() { It("should be mountable", func() {
config := VolumeTestConfig{ config := VolumeTestConfig{
namespace: namespace.Name, namespace: namespace.Name,
prefix: "cephfs", prefix: "cephfs",
...@@ -730,8 +729,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() { ...@@ -730,8 +729,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
// and that the usual OpenStack authentication env. variables are set // and that the usual OpenStack authentication env. variables are set
// (OS_USERNAME, OS_PASSWORD, OS_TENANT_NAME at least). // (OS_USERNAME, OS_PASSWORD, OS_TENANT_NAME at least).
framework.KubeDescribe("Cinder", func() { framework.KubeDescribe("Cinder [Feature:Volumes]", func() {
It("should be mountable [Volume]", func() { It("should be mountable", func() {
framework.SkipUnlessProviderIs("openstack") framework.SkipUnlessProviderIs("openstack")
config := VolumeTestConfig{ config := VolumeTestConfig{
namespace: namespace.Name, namespace: namespace.Name,
...@@ -807,7 +806,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() { ...@@ -807,7 +806,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("PD", func() { framework.KubeDescribe("PD", func() {
It("should be mountable [Volume]", func() { It("should be mountable", func() {
framework.SkipUnlessProviderIs("gce", "gke") framework.SkipUnlessProviderIs("gce", "gke")
config := VolumeTestConfig{ config := VolumeTestConfig{
namespace: namespace.Name, namespace: namespace.Name,
...@@ -857,7 +856,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() { ...@@ -857,7 +856,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("ConfigMap", func() { framework.KubeDescribe("ConfigMap", func() {
It("should be mountable [Volume]", func() { It("should be mountable", func() {
config := VolumeTestConfig{ config := VolumeTestConfig{
namespace: namespace.Name, namespace: namespace.Name,
prefix: "configmap", prefix: "configmap",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment