From 2335547a9cf7416cae30d4764efd22fea94b5b71 Mon Sep 17 00:00:00 2001 From: njuptlzf Date: Thu, 29 Apr 2021 17:20:58 +0800 Subject: [PATCH] cleanup: delete tempDir after flexvloume_test is executed --- pkg/volume/flexvolume/flexvolume_test.go | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkg/volume/flexvolume/flexvolume_test.go b/pkg/volume/flexvolume/flexvolume_test.go index 16643eb12cf..d6faa9adc22 100644 --- a/pkg/volume/flexvolume/flexvolume_test.go +++ b/pkg/volume/flexvolume/flexvolume_test.go @@ -26,6 +26,7 @@ import ( "k8s.io/api/core/v1" utiltesting "k8s.io/client-go/util/testing" + utilfs "k8s.io/kubernetes/pkg/util/filesystem" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/utils/exec" @@ -123,7 +124,9 @@ func TestCanSupport(t *testing.T) { plugMgr := volume.VolumePluginMgr{} runner := exec.New() installPluginUnderTest(t, "kubernetes.io", "fakeAttacher", tmpDir, execScriptTempl1, nil) - plugMgr.InitPlugins(nil, GetDynamicPluginProber(tmpDir, runner), volumetest.NewFakeVolumeHost(t, "fake", nil, nil)) + if err := plugMgr.InitPlugins(nil, GetDynamicPluginProberWithoutWatcher(tmpDir, runner), volumetest.NewFakeVolumeHost(t, "fake", nil, nil)); err != nil { + t.Fatalf("Could not initialize plugins: %v", err) + } plugin, err := plugMgr.FindPluginByName("kubernetes.io/fakeAttacher") if err != nil { t.Fatalf("Can't find the plugin by name") @@ -152,8 +155,9 @@ func TestGetAccessModes(t *testing.T) { plugMgr := volume.VolumePluginMgr{} runner := exec.New() installPluginUnderTest(t, "kubernetes.io", "fakeAttacher", tmpDir, execScriptTempl1, nil) - plugMgr.InitPlugins(nil, GetDynamicPluginProber(tmpDir, runner), volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil)) - + if err := plugMgr.InitPlugins(nil, GetDynamicPluginProberWithoutWatcher(tmpDir, runner), volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil)); err != nil { + t.Fatalf("Could not initialize plugins: %v", err) + } plugin, err := plugMgr.FindPersistentPluginByName("kubernetes.io/fakeAttacher") if err != nil { t.Fatalf("Can't find the plugin by name") @@ -162,3 +166,13 @@ func TestGetAccessModes(t *testing.T) { t.Errorf("Expected two AccessModeTypes: %s and %s", v1.ReadWriteOnce, v1.ReadOnlyMany) } } + +func GetDynamicPluginProberWithoutWatcher(pluginDir string, runner exec.Interface) volume.DynamicPluginProber { + return &flexVolumeProber{ + pluginDir: pluginDir, + watcher: newFakeWatcher(), + factory: pluginFactory{}, + runner: runner, + fs: &utilfs.DefaultFs{}, + } +}