Skip to content

Commit a1ee950

Browse files
medyaghmedyagh
authored
Merge pull request #7669 from medyagh/delete_tmp_file
clean up temp dir in unit test
2 parents 25e6902 + d4b48e1 commit a1ee950

File tree

11 files changed

+96
-9
lines changed

11 files changed

+96
-9
lines changed

‎cmd/minikube/cmd/delete_test.go

+15
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ func TestDeleteProfile(t *testing.T) {
6565
if err != nil {
6666
t.Fatalf("tempdir: %v", err)
6767
}
68+
69+
defer func() { //clean up tempdir
70+
err := os.RemoveAll(td)
71+
if err != nil {
72+
t.Errorf("failed to clean up temp folder %q", td)
73+
}
74+
}()
75+
6876
err = copy.Copy("../../../pkg/minikube/config/testdata/delete-single", td)
6977
if err != nil {
7078
t.Fatalf("copy: %v", err)
@@ -151,6 +159,13 @@ func TestDeleteAllProfiles(t *testing.T) {
151159
if err != nil {
152160
t.Fatalf("tempdir: %v", err)
153161
}
162+
defer func() { //clean up tempdir
163+
err := os.RemoveAll(td)
164+
if err != nil {
165+
t.Errorf("failed to clean up temp folder %q", td)
166+
}
167+
}()
168+
154169
err = copy.Copy("../../../pkg/minikube/config/testdata/delete-all", td)
155170
if err != nil {
156171
t.Fatalf("copy: %v", err)

‎pkg/drivers/hyperkit/iso_test.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ func TestExtractFile(t *testing.T) {
2727
if nil != err {
2828
return
2929
}
30-
defer os.Remove(testDir)
30+
defer func() { //clean up tempdir
31+
err := os.RemoveAll(testDir)
32+
if err != nil {
33+
t.Errorf("failed to clean up temp folder %q", testDir)
34+
}
35+
}()
3136

3237
tests := []struct {
3338
name string

‎pkg/minikube/download/binary_test.go

+13-1
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,24 @@ func TestCacheBinary(t *testing.T) {
3131
if err != nil {
3232
t.Fatalf("error during creating tmp dir: %v", err)
3333
}
34+
defer func() { //clean up tempdir
35+
err := os.RemoveAll(minikubeHome)
36+
if err != nil {
37+
t.Errorf("failed to clean up temp folder %q", minikubeHome)
38+
}
39+
}()
40+
3441
defer os.RemoveAll(minikubeHome)
3542
noWritePermDir, err := ioutil.TempDir("/tmp", "")
3643
if err != nil {
3744
t.Fatalf("error during creating tmp dir: %v", err)
3845
}
39-
defer os.RemoveAll(noWritePermDir)
46+
defer func() { //clean up tempdir
47+
err := os.RemoveAll(noWritePermDir)
48+
if err != nil {
49+
t.Errorf("failed to clean up temp folder %q", noWritePermDir)
50+
}
51+
}()
4052
err = os.Chmod(noWritePermDir, 0000)
4153
if err != nil {
4254
t.Fatalf("error (%v) during changing permissions of dir %v", err, noWritePermDir)

‎pkg/minikube/extract/extract_test.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,12 @@ func TestExtract(t *testing.T) {
3636
if err != nil {
3737
t.Fatalf("Creating temp dir: %v", err)
3838
}
39-
defer os.RemoveAll(tempdir)
39+
defer func() { //clean up tempdir
40+
err := os.RemoveAll(tempdir)
41+
if err != nil {
42+
t.Errorf("failed to clean up temp folder %q", tempdir)
43+
}
44+
}()
4045

4146
src, err := ioutil.ReadFile("testdata/test.json")
4247
if err != nil {

‎pkg/minikube/kubeconfig/kubeconfig_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,13 @@ func TestUpdate(t *testing.T) {
167167
if err != nil {
168168
t.Fatalf("Error making temp directory %v", err)
169169
}
170+
defer func() { //clean up tempdir
171+
err := os.RemoveAll(tmpDir)
172+
if err != nil {
173+
t.Errorf("failed to clean up temp folder %q", tmpDir)
174+
}
175+
}()
176+
170177
test.cfg.SetPath(filepath.Join(tmpDir, "kubeconfig"))
171178
if len(test.existingCfg) != 0 {
172179
if err := ioutil.WriteFile(test.cfg.filePath(), test.existingCfg, 0600); err != nil {

‎pkg/minikube/localpath/localpath_test.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ func TestReplaceWinDriveLetterToVolumeName(t *testing.T) {
3333
if err != nil {
3434
t.Fatalf("Error make tmp directory: %v", err)
3535
}
36-
defer os.RemoveAll(path)
36+
defer func() { //clean up tempdir
37+
err := os.RemoveAll(path)
38+
if err != nil {
39+
t.Errorf("failed to clean up temp folder %q", path)
40+
}
41+
}()
3742

3843
if runtime.GOOS != "windows" {
3944
// Replace to fake func.

‎pkg/minikube/machine/cache_binaries_test.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ func TestCacheBinariesForBootstrapper(t *testing.T) {
8989
if err != nil {
9090
t.Fatalf("error during creating tmp dir: %v", err)
9191
}
92-
defer os.RemoveAll(minikubeHome)
92+
93+
defer func() { //clean up tempdir
94+
err := os.RemoveAll(minikubeHome)
95+
if err != nil {
96+
t.Errorf("failed to clean up temp folder %q", minikubeHome)
97+
}
98+
}()
9399

94100
var tc = []struct {
95101
version, clusterBootstrapper string

‎pkg/minikube/machine/client_test.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,12 @@ func makeTempDir() string {
125125

126126
func TestRunNotDriver(t *testing.T) {
127127
tempDir := makeTempDir()
128-
defer os.RemoveAll(tempDir)
128+
defer func() { //clean up tempdir
129+
err := os.RemoveAll(tempDir)
130+
if err != nil {
131+
t.Errorf("failed to clean up temp folder %q", tempDir)
132+
}
133+
}()
129134
StartDriver()
130135
if !localbinary.CurrentBinaryIsDockerMachine {
131136
t.Fatal("CurrentBinaryIsDockerMachine not set. This will break driver initialization.")

‎pkg/minikube/machine/filesync_test.go

+6
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,12 @@ func TestAssetsFromDir(t *testing.T) {
108108
for _, test := range tests {
109109
t.Run(test.description, func(t *testing.T) {
110110
testDir, err := setupTestDir()
111+
defer func() { //clean up tempdir
112+
err := os.RemoveAll(testDir)
113+
if err != nil {
114+
t.Errorf("failed to clean up temp folder %q", testDir)
115+
}
116+
}()
111117
if err != nil {
112118
t.Errorf("got unexpected error creating test dir: %v", err)
113119
return

‎pkg/util/crypto_test.go

+18-3
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,15 @@ import (
3030

3131
func TestGenerateCACert(t *testing.T) {
3232
tmpDir, err := ioutil.TempDir("", "")
33+
defer func() { //clean up tempdir
34+
err := os.RemoveAll(tmpDir)
35+
if err != nil {
36+
t.Errorf("failed to clean up temp folder %q", tmpDir)
37+
}
38+
}()
3339
if err != nil {
3440
t.Fatalf("Error generating tmpdir: %v", err)
3541
}
36-
defer os.RemoveAll(tmpDir)
3742

3843
certPath := filepath.Join(tmpDir, "cert")
3944
keyPath := filepath.Join(tmpDir, "key")
@@ -58,16 +63,26 @@ func TestGenerateCACert(t *testing.T) {
5863

5964
func TestGenerateSignedCert(t *testing.T) {
6065
tmpDir, err := ioutil.TempDir("", "")
66+
defer func() { //clean up tempdir
67+
err := os.RemoveAll(tmpDir)
68+
if err != nil {
69+
t.Errorf("failed to clean up temp folder %q", tmpDir)
70+
}
71+
}()
6172
if err != nil {
6273
t.Fatalf("Error generating tmpdir: %v", err)
6374
}
64-
defer os.RemoveAll(tmpDir)
6575

6676
signerTmpDir, err := ioutil.TempDir("", "")
77+
defer func() { //clean up tempdir
78+
err := os.RemoveAll(signerTmpDir)
79+
if err != nil {
80+
t.Errorf("failed to clean up temp folder %q", signerTmpDir)
81+
}
82+
}()
6783
if err != nil {
6884
t.Fatalf("Error generating signer tmpdir: %v", err)
6985
}
70-
defer os.RemoveAll(signerTmpDir)
7186

7287
validSignerCertPath := filepath.Join(signerTmpDir, "cert")
7388
validSignerKeyPath := filepath.Join(signerTmpDir, "key")

‎test/integration/fn_mount_cmd.go

+6
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
5252
}
5353

5454
tempDir, err := ioutil.TempDir("", "mounttest")
55+
defer func() { //clean up tempdir
56+
err := os.RemoveAll(tempDir)
57+
if err != nil {
58+
t.Errorf("failed to clean up %q temp folder.", tempDir)
59+
}
60+
}()
5561
if err != nil {
5662
t.Fatalf("Unexpected error while creating tempDir: %v", err)
5763
}

0 commit comments

Comments
 (0)