From 915d6365f1e5da05f542262e70bad1165c7e7f30 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Thu, 7 Mar 2019 15:45:40 +0100 Subject: [PATCH 1/2] e2e/storage: fix snapshot support in external driver testing When using an already installed driver, the snapshot name is the original driver name. Renaming was incorrectly copied from the in-tree CSI hostpath driver. --- test/e2e/storage/external/external.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/storage/external/external.go b/test/e2e/storage/external/external.go index eb4fcb9409..0ecfa8997f 100644 --- a/test/e2e/storage/external/external.go +++ b/test/e2e/storage/external/external.go @@ -253,7 +253,7 @@ func (d *driverDefinition) GetSnapshotClass(config *testsuites.PerTestConfig) *u framework.Skipf("Driver %q does not support snapshotting - skipping", d.DriverInfo.Name) } - snapshotter := config.GetUniqueDriverName() + snapshotter := d.DriverInfo.Name parameters := map[string]string{} ns := config.Framework.Namespace.Name suffix := snapshotter + "-vsc" From e84271ed8ad04c94ce3c0a6fecd9f8dff834e861 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Thu, 7 Mar 2019 16:57:16 +0100 Subject: [PATCH 2/2] e2e/storage: allow empty volume type This can happen when the test pattern is about snapshotting. --- test/e2e/storage/external/external.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/e2e/storage/external/external.go b/test/e2e/storage/external/external.go index 0ecfa8997f..fd9fd4401f 100644 --- a/test/e2e/storage/external/external.go +++ b/test/e2e/storage/external/external.go @@ -192,6 +192,8 @@ func (d *driverDefinition) SkipUnsupportedTest(pattern testpatterns.TestPattern) supported := false // TODO (?): add support for more volume types switch pattern.VolType { + case "": + supported = true case testpatterns.DynamicPV: if d.StorageClass.FromName || d.StorageClass.FromFile != "" { supported = true