From d4b48e1e05ffa373dfa4ed784ddbe0f994c7fe8f Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Tue, 14 Apr 2020 19:33:26 -0700 Subject: [PATCH] clean up after test dirs --- cmd/minikube/cmd/delete_test.go | 10 +++++++++- pkg/drivers/hyperkit/iso_test.go | 7 ++++++- pkg/minikube/download/binary_test.go | 14 +++++++++++++- pkg/minikube/extract/extract_test.go | 7 ++++++- pkg/minikube/kubeconfig/kubeconfig_test.go | 7 +++++++ pkg/minikube/localpath/localpath_test.go | 7 ++++++- pkg/minikube/machine/cache_binaries_test.go | 8 +++++++- pkg/minikube/machine/client_test.go | 7 ++++++- pkg/minikube/machine/filesync_test.go | 6 ++++++ pkg/util/crypto_test.go | 21 ++++++++++++++++++--- test/integration/fn_mount_cmd.go | 6 ++++++ 11 files changed, 90 insertions(+), 10 deletions(-) diff --git a/cmd/minikube/cmd/delete_test.go b/cmd/minikube/cmd/delete_test.go index 835c911699..90e0fadc8f 100644 --- a/cmd/minikube/cmd/delete_test.go +++ b/cmd/minikube/cmd/delete_test.go @@ -65,6 +65,14 @@ func TestDeleteProfile(t *testing.T) { if err != nil { t.Fatalf("tempdir: %v", err) } + + defer func() { //clean up tempdir + err := os.RemoveAll(td) + if err != nil { + t.Errorf("failed to clean up temp folder %q", td) + } + }() + err = copy.Copy("../../../pkg/minikube/config/testdata/delete-single", td) if err != nil { t.Fatalf("copy: %v", err) @@ -154,7 +162,7 @@ func TestDeleteAllProfiles(t *testing.T) { defer func() { //clean up tempdir err := os.RemoveAll(td) if err != nil { - t.Errorf("failed to clean up %q temp folder after the unit test.", td) + t.Errorf("failed to clean up temp folder %q", td) } }() diff --git a/pkg/drivers/hyperkit/iso_test.go b/pkg/drivers/hyperkit/iso_test.go index 8dda1e4a6e..d3999add80 100644 --- a/pkg/drivers/hyperkit/iso_test.go +++ b/pkg/drivers/hyperkit/iso_test.go @@ -27,7 +27,12 @@ func TestExtractFile(t *testing.T) { if nil != err { return } - defer os.Remove(testDir) + defer func() { //clean up tempdir + err := os.RemoveAll(testDir) + if err != nil { + t.Errorf("failed to clean up temp folder %q", testDir) + } + }() tests := []struct { name string diff --git a/pkg/minikube/download/binary_test.go b/pkg/minikube/download/binary_test.go index 79c23131c2..5a481405e2 100644 --- a/pkg/minikube/download/binary_test.go +++ b/pkg/minikube/download/binary_test.go @@ -31,12 +31,24 @@ func TestCacheBinary(t *testing.T) { if err != nil { t.Fatalf("error during creating tmp dir: %v", err) } + defer func() { //clean up tempdir + err := os.RemoveAll(minikubeHome) + if err != nil { + t.Errorf("failed to clean up temp folder %q", minikubeHome) + } + }() + defer os.RemoveAll(minikubeHome) noWritePermDir, err := ioutil.TempDir("/tmp", "") if err != nil { t.Fatalf("error during creating tmp dir: %v", err) } - defer os.RemoveAll(noWritePermDir) + defer func() { //clean up tempdir + err := os.RemoveAll(noWritePermDir) + if err != nil { + t.Errorf("failed to clean up temp folder %q", noWritePermDir) + } + }() err = os.Chmod(noWritePermDir, 0000) if err != nil { t.Fatalf("error (%v) during changing permissions of dir %v", err, noWritePermDir) diff --git a/pkg/minikube/extract/extract_test.go b/pkg/minikube/extract/extract_test.go index c0ac9914f9..352151dc2f 100644 --- a/pkg/minikube/extract/extract_test.go +++ b/pkg/minikube/extract/extract_test.go @@ -36,7 +36,12 @@ func TestExtract(t *testing.T) { if err != nil { t.Fatalf("Creating temp dir: %v", err) } - defer os.RemoveAll(tempdir) + defer func() { //clean up tempdir + err := os.RemoveAll(tempdir) + if err != nil { + t.Errorf("failed to clean up temp folder %q", tempdir) + } + }() src, err := ioutil.ReadFile("testdata/test.json") if err != nil { diff --git a/pkg/minikube/kubeconfig/kubeconfig_test.go b/pkg/minikube/kubeconfig/kubeconfig_test.go index c41f167f03..8a0df17120 100644 --- a/pkg/minikube/kubeconfig/kubeconfig_test.go +++ b/pkg/minikube/kubeconfig/kubeconfig_test.go @@ -167,6 +167,13 @@ func TestUpdate(t *testing.T) { if err != nil { t.Fatalf("Error making temp directory %v", err) } + defer func() { //clean up tempdir + err := os.RemoveAll(tmpDir) + if err != nil { + t.Errorf("failed to clean up temp folder %q", tmpDir) + } + }() + test.cfg.SetPath(filepath.Join(tmpDir, "kubeconfig")) if len(test.existingCfg) != 0 { if err := ioutil.WriteFile(test.cfg.filePath(), test.existingCfg, 0600); err != nil { diff --git a/pkg/minikube/localpath/localpath_test.go b/pkg/minikube/localpath/localpath_test.go index d8e6915a43..00f52d09da 100644 --- a/pkg/minikube/localpath/localpath_test.go +++ b/pkg/minikube/localpath/localpath_test.go @@ -33,7 +33,12 @@ func TestReplaceWinDriveLetterToVolumeName(t *testing.T) { if err != nil { t.Fatalf("Error make tmp directory: %v", err) } - defer os.RemoveAll(path) + defer func() { //clean up tempdir + err := os.RemoveAll(path) + if err != nil { + t.Errorf("failed to clean up temp folder %q", path) + } + }() if runtime.GOOS != "windows" { // Replace to fake func. diff --git a/pkg/minikube/machine/cache_binaries_test.go b/pkg/minikube/machine/cache_binaries_test.go index 500c0ea74d..f83fbfc832 100644 --- a/pkg/minikube/machine/cache_binaries_test.go +++ b/pkg/minikube/machine/cache_binaries_test.go @@ -89,7 +89,13 @@ func TestCacheBinariesForBootstrapper(t *testing.T) { if err != nil { t.Fatalf("error during creating tmp dir: %v", err) } - defer os.RemoveAll(minikubeHome) + + defer func() { //clean up tempdir + err := os.RemoveAll(minikubeHome) + if err != nil { + t.Errorf("failed to clean up temp folder %q", minikubeHome) + } + }() var tc = []struct { version, clusterBootstrapper string diff --git a/pkg/minikube/machine/client_test.go b/pkg/minikube/machine/client_test.go index 36465c5b08..b2cafc9428 100644 --- a/pkg/minikube/machine/client_test.go +++ b/pkg/minikube/machine/client_test.go @@ -125,7 +125,12 @@ func makeTempDir() string { func TestRunNotDriver(t *testing.T) { tempDir := makeTempDir() - defer os.RemoveAll(tempDir) + defer func() { //clean up tempdir + err := os.RemoveAll(tempDir) + if err != nil { + t.Errorf("failed to clean up temp folder %q", tempDir) + } + }() StartDriver() if !localbinary.CurrentBinaryIsDockerMachine { t.Fatal("CurrentBinaryIsDockerMachine not set. This will break driver initialization.") diff --git a/pkg/minikube/machine/filesync_test.go b/pkg/minikube/machine/filesync_test.go index 143c3e9ab7..a69be410f0 100644 --- a/pkg/minikube/machine/filesync_test.go +++ b/pkg/minikube/machine/filesync_test.go @@ -108,6 +108,12 @@ func TestAssetsFromDir(t *testing.T) { for _, test := range tests { t.Run(test.description, func(t *testing.T) { testDir, err := setupTestDir() + defer func() { //clean up tempdir + err := os.RemoveAll(testDir) + if err != nil { + t.Errorf("failed to clean up temp folder %q", testDir) + } + }() if err != nil { t.Errorf("got unexpected error creating test dir: %v", err) return diff --git a/pkg/util/crypto_test.go b/pkg/util/crypto_test.go index bbce6bcb6f..aa19852591 100644 --- a/pkg/util/crypto_test.go +++ b/pkg/util/crypto_test.go @@ -30,10 +30,15 @@ import ( func TestGenerateCACert(t *testing.T) { tmpDir, err := ioutil.TempDir("", "") + defer func() { //clean up tempdir + err := os.RemoveAll(tmpDir) + if err != nil { + t.Errorf("failed to clean up temp folder %q", tmpDir) + } + }() if err != nil { t.Fatalf("Error generating tmpdir: %v", err) } - defer os.RemoveAll(tmpDir) certPath := filepath.Join(tmpDir, "cert") keyPath := filepath.Join(tmpDir, "key") @@ -58,16 +63,26 @@ func TestGenerateCACert(t *testing.T) { func TestGenerateSignedCert(t *testing.T) { tmpDir, err := ioutil.TempDir("", "") + defer func() { //clean up tempdir + err := os.RemoveAll(tmpDir) + if err != nil { + t.Errorf("failed to clean up temp folder %q", tmpDir) + } + }() if err != nil { t.Fatalf("Error generating tmpdir: %v", err) } - defer os.RemoveAll(tmpDir) signerTmpDir, err := ioutil.TempDir("", "") + defer func() { //clean up tempdir + err := os.RemoveAll(signerTmpDir) + if err != nil { + t.Errorf("failed to clean up temp folder %q", signerTmpDir) + } + }() if err != nil { t.Fatalf("Error generating signer tmpdir: %v", err) } - defer os.RemoveAll(signerTmpDir) validSignerCertPath := filepath.Join(signerTmpDir, "cert") validSignerKeyPath := filepath.Join(signerTmpDir, "key") diff --git a/test/integration/fn_mount_cmd.go b/test/integration/fn_mount_cmd.go index 915262a833..f6e218d8a4 100644 --- a/test/integration/fn_mount_cmd.go +++ b/test/integration/fn_mount_cmd.go @@ -52,6 +52,12 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) { } tempDir, err := ioutil.TempDir("", "mounttest") + defer func() { //clean up tempdir + err := os.RemoveAll(tempDir) + if err != nil { + t.Errorf("failed to clean up %q temp folder.", tempDir) + } + }() if err != nil { t.Fatalf("Unexpected error while creating tempDir: %v", err) }