From b828e570b10d1ff12171b467aa771a41fb004fa4 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Mon, 20 May 2019 13:12:38 +0800 Subject: [PATCH] fix golint failures of test/e2e/storage/drivers --- hack/.golint_failures | 1 - test/e2e/storage/drivers/csi.go | 2 ++ test/e2e/storage/drivers/in_tree.go | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index e587486e5db..9e73bd3047c 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -595,7 +595,6 @@ test/e2e/chaosmonkey test/e2e/common test/e2e/lifecycle/bootstrap test/e2e/scalability -test/e2e/storage/drivers test/e2e/storage/testsuites test/e2e/storage/utils test/e2e/storage/vsphere diff --git a/test/e2e/storage/drivers/csi.go b/test/e2e/storage/drivers/csi.go index b4e0c88a574..12537856b2d 100644 --- a/test/e2e/storage/drivers/csi.go +++ b/test/e2e/storage/drivers/csi.go @@ -51,7 +51,9 @@ import ( ) const ( + // GCEPDCSIProvisionerName is the name of GCE Persistent Disk CSI provisioner GCEPDCSIProvisionerName = "pd.csi.storage.gke.io" + // GCEPDCSIZoneTopologyKey is the key of GCE Persistent Disk CSI zone topology GCEPDCSIZoneTopologyKey = "topology.gke.io/zone" ) diff --git a/test/e2e/storage/drivers/in_tree.go b/test/e2e/storage/drivers/in_tree.go index 5bcd3c3426a..e2329110fbb 100644 --- a/test/e2e/storage/drivers/in_tree.go +++ b/test/e2e/storage/drivers/in_tree.go @@ -1207,7 +1207,7 @@ func (g *gcePdDriver) GetDynamicProvisionStorageClass(config *testsuites.PerTest return testsuites.GetStorageClass(provisioner, parameters, &delayedBinding, ns, suffix) } -func (h *gcePdDriver) GetClaimSize() string { +func (g *gcePdDriver) GetClaimSize() string { return "5Gi" } @@ -1652,6 +1652,7 @@ var _ testsuites.TestDriver = &localDriver{} var _ testsuites.PreprovisionedVolumeTestDriver = &localDriver{} var _ testsuites.PreprovisionedPVTestDriver = &localDriver{} +// InitLocalDriverWithVolumeType initializes the local driver based on the volume type. func InitLocalDriverWithVolumeType(volumeType utils.LocalVolumeType) func() testsuites.TestDriver { maxFileSize := defaultLocalVolumeMaxFileSize if maxFileSizeByVolType, ok := localVolumeMaxFileSizes[volumeType]; ok {