github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

storage: make tests independent of CSIInlineVolume default

Browse Source 
Some tests assumed instead of ensuring that the CSIInlineVolume
feature is disabled.
This commit is contained in:
Patrick Ohly 2019-08-27 17:30:08 +02:00
parent 07e0cce409
commit 599a9faf8d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/volume/csi/csi_mounter_test.go
View File

@ -154,8 +154,8 @@ func MounterSetUpTests(t *testing.T, podInfoEnabled bool) {
klog.Infof("Starting test %s", test.name) klog.Infof("Starting test %s", test.name)
// Modes must be set if (and only if) CSIInlineVolume is enabled. // Modes must be set if (and only if) CSIInlineVolume is enabled.
var modes []storagev1beta1.VolumeLifecycleMode var modes []storagev1beta1.VolumeLifecycleMode
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIInlineVolume, test.csiInlineVolume)()
if test.csiInlineVolume { if test.csiInlineVolume {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIInlineVolume, true)()
modes = append(modes, storagev1beta1.VolumeLifecyclePersistent) modes = append(modes, storagev1beta1.VolumeLifecyclePersistent)
} }
fakeClient := fakeclient.NewSimpleClientset( fakeClient := fakeclient.NewSimpleClientset(

1
pkg/volume/csi/csi_plugin_test.go
View File

@ -231,6 +231,7 @@ func TestPluginGetVolumeNameWithInline(t *testing.T) {
func TestPluginCanSupport(t *testing.T) { func TestPluginCanSupport(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIBlockVolume, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIBlockVolume, true)()
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIInlineVolume, false)()
tests := []struct { tests := []struct {
name string name string