X Tutup
Skip to content

Commit 2f94ada

Browse files
cristiand391cristiand391
authored
Use T.TempDir for temporary dirs in tests (cli#3580)
1 parent 25d79c4 commit 2f94ada

File tree

8 files changed

+28
-40
lines changed

8 files changed

+28
-40
lines changed

‎internal/docs/man_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,10 @@ func assertNextLineEquals(scanner *bufio.Scanner, expectedLine string) error {
175175
}
176176

177177
func BenchmarkGenManToFile(b *testing.B) {
178-
file, err := ioutil.TempFile("", "")
178+
file, err := ioutil.TempFile(b.TempDir(), "")
179179
if err != nil {
180180
b.Fatal(err)
181181
}
182-
defer os.Remove(file.Name())
183182
defer file.Close()
184183

185184
b.ResetTimer()

‎internal/docs/markdown_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,10 @@ func TestGenMdTree(t *testing.T) {
8383
}
8484

8585
func BenchmarkGenMarkdownToFile(b *testing.B) {
86-
file, err := ioutil.TempFile("", "")
86+
file, err := ioutil.TempFile(b.TempDir(), "")
8787
if err != nil {
8888
b.Fatal(err)
8989
}
90-
defer os.Remove(file.Name())
9190
defer file.Close()
9291

9392
b.ResetTimer()

‎pkg/cmd/api/api_test.go‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,9 @@ func Test_apiRun_inputFile(t *testing.T) {
693693
contentLength: 10,
694694
},
695695
}
696+
697+
tempDir := t.TempDir()
698+
696699
for _, tt := range tests {
697700
t.Run(tt.name, func(t *testing.T) {
698701
io, stdin, _, _ := iostreams.Test()
@@ -702,13 +705,12 @@ func Test_apiRun_inputFile(t *testing.T) {
702705
if tt.inputFile == "-" {
703706
_, _ = stdin.Write(tt.inputContents)
704707
} else {
705-
f, err := ioutil.TempFile("", tt.inputFile)
708+
f, err := ioutil.TempFile(tempDir, tt.inputFile)
706709
if err != nil {
707710
t.Fatal(err)
708711
}
709712
_, _ = f.Write(tt.inputContents)
710-
f.Close()
711-
t.Cleanup(func() { os.Remove(f.Name()) })
713+
defer f.Close()
712714
inputFile = f.Name()
713715
}
714716

@@ -825,13 +827,13 @@ func Test_parseFields(t *testing.T) {
825827
}
826828

827829
func Test_magicFieldValue(t *testing.T) {
828-
f, err := ioutil.TempFile("", "gh-test")
830+
f, err := ioutil.TempFile(t.TempDir(), "gh-test")
829831
if err != nil {
830832
t.Fatal(err)
831833
}
834+
defer f.Close()
835+
832836
fmt.Fprint(f, "file contents")
833-
f.Close()
834-
t.Cleanup(func() { os.Remove(f.Name()) })
835837

836838
io, _, _, _ := iostreams.Test()
837839

@@ -932,13 +934,13 @@ func Test_magicFieldValue(t *testing.T) {
932934
}
933935

934936
func Test_openUserFile(t *testing.T) {
935-
f, err := ioutil.TempFile("", "gh-test")
937+
f, err := ioutil.TempFile(t.TempDir(), "gh-test")
936938
if err != nil {
937939
t.Fatal(err)
938940
}
941+
defer f.Close()
942+
939943
fmt.Fprint(f, "file contents")
940-
f.Close()
941-
t.Cleanup(func() { os.Remove(f.Name()) })
942944

943945
file, length, err := openUserFile(f.Name(), nil)
944946
if err != nil {

‎pkg/cmd/issue/create/create_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"fmt"
77
"io/ioutil"
88
"net/http"
9-
"os"
109
"path/filepath"
1110
"strings"
1211
"testing"
@@ -422,8 +421,9 @@ func TestIssueCreate_recover(t *testing.T) {
422421
},
423422
})
424423

425-
tmpfile, err := ioutil.TempFile(os.TempDir(), "testrecover*")
424+
tmpfile, err := ioutil.TempFile(t.TempDir(), "testrecover*")
426425
assert.NoError(t, err)
426+
defer tmpfile.Close()
427427

428428
state := prShared.IssueMetadataState{
429429
Title: "recovered title",

‎pkg/cmd/pr/create/create_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"fmt"
77
"io/ioutil"
88
"net/http"
9-
"os"
109
"path/filepath"
1110
"testing"
1211

@@ -309,8 +308,9 @@ func TestPRCreate_recover(t *testing.T) {
309308
},
310309
})
311310

312-
tmpfile, err := ioutil.TempFile(os.TempDir(), "testrecover*")
311+
tmpfile, err := ioutil.TempFile(t.TempDir(), "testrecover*")
313312
assert.NoError(t, err)
313+
defer tmpfile.Close()
314314

315315
state := prShared.IssueMetadataState{
316316
Title: "recovered title",

‎pkg/cmd/pr/shared/preserve_test.go‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"encoding/json"
55
"errors"
66
"io/ioutil"
7-
"os"
87
"testing"
98

109
"github.com/cli/cli/pkg/iostreams"
@@ -70,6 +69,8 @@ func Test_PreserveInput(t *testing.T) {
7069
},
7170
}
7271

72+
tempDir := t.TempDir()
73+
7374
for _, tt := range tests {
7475
t.Run(tt.name, func(t *testing.T) {
7576
if tt.state == nil {
@@ -78,9 +79,9 @@ func Test_PreserveInput(t *testing.T) {
7879

7980
io, _, _, errOut := iostreams.Test()
8081

81-
tf, tferr := tmpfile()
82+
tf, tferr := ioutil.TempFile(tempDir, "testfile*")
8283
assert.NoError(t, tferr)
83-
defer os.Remove(tf.Name())
84+
defer tf.Close()
8485

8586
io.TempFileOverride = tf
8687

@@ -111,13 +112,3 @@ func Test_PreserveInput(t *testing.T) {
111112
})
112113
}
113114
}
114-
115-
func tmpfile() (*os.File, error) {
116-
dir := os.TempDir()
117-
tmpfile, err := ioutil.TempFile(dir, "testfile*")
118-
if err != nil {
119-
return nil, err
120-
}
121-
122-
return tmpfile, nil
123-
}

‎pkg/cmd/workflow/run/run_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"fmt"
88
"io/ioutil"
99
"net/http"
10-
"os"
1110
"testing"
1211

1312
"github.com/cli/cli/api"
@@ -149,13 +148,13 @@ func TestNewCmdRun(t *testing.T) {
149148
}
150149

151150
func Test_magicFieldValue(t *testing.T) {
152-
f, err := ioutil.TempFile("", "gh-test")
151+
f, err := ioutil.TempFile(t.TempDir(), "gh-test")
153152
if err != nil {
154153
t.Fatal(err)
155154
}
155+
defer f.Close()
156+
156157
fmt.Fprint(f, "file contents")
157-
f.Close()
158-
t.Cleanup(func() { os.Remove(f.Name()) })
159158

160159
io, _, _, _ := iostreams.Test()
161160

‎pkg/githubtemplate/github_template_test.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,11 @@ func TestFindLegacy(t *testing.T) {
261261
}
262262

263263
func TestExtractName(t *testing.T) {
264-
tmpfile, err := ioutil.TempFile("", "gh-cli")
264+
tmpfile, err := ioutil.TempFile(t.TempDir(), "gh-cli")
265265
if err != nil {
266266
t.Fatal(err)
267267
}
268-
tmpfile.Close()
269-
defer os.Remove(tmpfile.Name())
268+
defer tmpfile.Close()
270269

271270
type args struct {
272271
filePath string
@@ -322,12 +321,11 @@ about: This is how you report bugs
322321
}
323322

324323
func TestExtractContents(t *testing.T) {
325-
tmpfile, err := ioutil.TempFile("", "gh-cli")
324+
tmpfile, err := ioutil.TempFile(t.TempDir(), "gh-cli")
326325
if err != nil {
327326
t.Fatal(err)
328327
}
329-
tmpfile.Close()
330-
defer os.Remove(tmpfile.Name())
328+
defer tmpfile.Close()
331329

332330
type args struct {
333331
filePath string

0 commit comments

Comments
 (0)
X Tutup