From 1aa6e928ce14a1496cebfc877a3790b9773a4d88 Mon Sep 17 00:00:00 2001 From: Ma Xinjian Date: Mon, 23 Nov 2020 15:39:14 +0800 Subject: [PATCH] Cleanup tempfiles introduced by unit tests under pkg/ Signed-off-by: Ma Xinjian --- pkg/downloader/chart_downloader_test.go | 1 + pkg/plugin/installer/local_installer_test.go | 1 + pkg/repo/chartrepo_test.go | 1 + pkg/repo/repotest/server_test.go | 2 ++ 4 files changed, 5 insertions(+) diff --git a/pkg/downloader/chart_downloader_test.go b/pkg/downloader/chart_downloader_test.go index b9fd3bf87..334d7aaa1 100644 --- a/pkg/downloader/chart_downloader_test.go +++ b/pkg/downloader/chart_downloader_test.go @@ -283,6 +283,7 @@ func TestDownloadTo_VerifyLater(t *testing.T) { defer ensure.HelmHome(t)() dest := ensure.TempDir(t) + defer os.RemoveAll(dest) // Set up a fake repo srv, err := repotest.NewTempServerWithCleanup(t, "testdata/*.tgz*") diff --git a/pkg/plugin/installer/local_installer_test.go b/pkg/plugin/installer/local_installer_test.go index 96958ab09..0d3de11d1 100644 --- a/pkg/plugin/installer/local_installer_test.go +++ b/pkg/plugin/installer/local_installer_test.go @@ -50,4 +50,5 @@ func TestLocalInstaller(t *testing.T) { if i.Path() != helmpath.DataPath("plugins", "echo") { t.Fatalf("expected path '$XDG_CONFIG_HOME/helm/plugins/helm-env', got %q", i.Path()) } + defer os.RemoveAll(filepath.Dir(helmpath.DataPath())) // helmpath.DataPath is like /tmp/helm013130971/helm } diff --git a/pkg/repo/chartrepo_test.go b/pkg/repo/chartrepo_test.go index cb0a129a1..7bd563460 100644 --- a/pkg/repo/chartrepo_test.go +++ b/pkg/repo/chartrepo_test.go @@ -148,6 +148,7 @@ func TestIndexCustomSchemeDownload(t *testing.T) { t.Fatalf("Problem loading chart repository from %s: %v", repoURL, err) } repo.CachePath = ensure.TempDir(t) + defer os.RemoveAll(repo.CachePath) tempIndexFile, err := ioutil.TempFile("", "test-repo") if err != nil { diff --git a/pkg/repo/repotest/server_test.go b/pkg/repo/repotest/server_test.go index 6d71071da..1ad979fdc 100644 --- a/pkg/repo/repotest/server_test.go +++ b/pkg/repo/repotest/server_test.go @@ -18,6 +18,7 @@ package repotest import ( "io/ioutil" "net/http" + "os" "path/filepath" "testing" @@ -33,6 +34,7 @@ func TestServer(t *testing.T) { defer ensure.HelmHome(t)() rootDir := ensure.TempDir(t) + defer os.RemoveAll(rootDir) srv := NewServer(rootDir) defer srv.Stop()