From 599a9faf8dd2bc241a019cb2237b2caea658286e Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Tue, 27 Aug 2019 17:30:08 +0200 Subject: [PATCH] storage: make tests independent of CSIInlineVolume default Some tests assumed instead of ensuring that the CSIInlineVolume feature is disabled. --- pkg/volume/csi/csi_mounter_test.go | 2 +- pkg/volume/csi/csi_plugin_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/volume/csi/csi_mounter_test.go b/pkg/volume/csi/csi_mounter_test.go index c93fc55c808..ef62b7ca290 100644 --- a/pkg/volume/csi/csi_mounter_test.go +++ b/pkg/volume/csi/csi_mounter_test.go @@ -154,8 +154,8 @@ func MounterSetUpTests(t *testing.T, podInfoEnabled bool) { klog.Infof("Starting test %s", test.name) // Modes must be set if (and only if) CSIInlineVolume is enabled. var modes []storagev1beta1.VolumeLifecycleMode + defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIInlineVolume, test.csiInlineVolume)() if test.csiInlineVolume { - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIInlineVolume, true)() modes = append(modes, storagev1beta1.VolumeLifecyclePersistent) } fakeClient := fakeclient.NewSimpleClientset( diff --git a/pkg/volume/csi/csi_plugin_test.go b/pkg/volume/csi/csi_plugin_test.go index 90733581037..0e77da2acc2 100644 --- a/pkg/volume/csi/csi_plugin_test.go +++ b/pkg/volume/csi/csi_plugin_test.go @@ -231,6 +231,7 @@ func TestPluginGetVolumeNameWithInline(t *testing.T) { func TestPluginCanSupport(t *testing.T) { defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIBlockVolume, true)() + defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIInlineVolume, false)() tests := []struct { name string