From bd0579103adc5101bbb9660458707ff6ce1318ae Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Thu, 2 Jul 2020 16:44:14 +0200
Subject: [PATCH] e2e storage: dead code removal and cleanup

Setting testParameters.scName had no effect because
StorageClassTest.StorageClassName isn't used anywhere. Instead, the
storage class name is generated dynamically.
---
 test/e2e/storage/csi_mock_volume.go         | 22 +++++++--------------
 test/e2e/storage/testsuites/provisioning.go |  1 -
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/test/e2e/storage/csi_mock_volume.go b/test/e2e/storage/csi_mock_volume.go
index 3ca6f4be7ae..c69ee6879e9 100644
--- a/test/e2e/storage/csi_mock_volume.go
+++ b/test/e2e/storage/csi_mock_volume.go
@@ -162,19 +162,13 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
 			sc = dDriver.GetDynamicProvisionStorageClass(m.config, "")
 		}
 		scTest := testsuites.StorageClassTest{
-			Name:         m.driver.GetDriverInfo().Name,
-			Provisioner:  sc.Provisioner,
-			Parameters:   sc.Parameters,
-			ClaimSize:    "1Gi",
-			ExpectedSize: "1Gi",
-			DelayBinding: m.tp.lateBinding,
-		}
-		if m.tp.scName != "" {
-			scTest.StorageClassName = m.tp.scName
-		}
-
-		if m.tp.enableResizing {
-			scTest.AllowVolumeExpansion = true
+			Name:                 m.driver.GetDriverInfo().Name,
+			Provisioner:          sc.Provisioner,
+			Parameters:           sc.Parameters,
+			ClaimSize:            "1Gi",
+			ExpectedSize:         "1Gi",
+			DelayBinding:         m.tp.lateBinding,
+			AllowVolumeExpansion: m.tp.enableResizing,
 		}
 
 		// The mock driver only works when everything runs on a single node.
@@ -354,7 +348,6 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
 			ginkgo.It(t.name, func() {
 				init(testParameters{
 					registerDriver: test.deployClusterRegistrar,
-					scName:         "csi-mock-sc-" + f.UniqueName,
 					podInfo:        test.podInfoOnMount})
 
 				defer cleanup()
@@ -682,7 +675,6 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
 				init(testParameters{
 					disableAttach:   true,
 					registerDriver:  true,
-					scName:          "csi-mock-sc-" + f.UniqueName,
 					javascriptHooks: scripts,
 				})
 				defer cleanup()
diff --git a/test/e2e/storage/testsuites/provisioning.go b/test/e2e/storage/testsuites/provisioning.go
index 63070544b7a..3e6f62c74ff 100644
--- a/test/e2e/storage/testsuites/provisioning.go
+++ b/test/e2e/storage/testsuites/provisioning.go
@@ -52,7 +52,6 @@ type StorageClassTest struct {
 	Name                 string
 	CloudProviders       []string
 	Provisioner          string
-	StorageClassName     string
 	Parameters           map[string]string
 	DelayBinding         bool
 	ClaimSize            string