Skip to content

Commit ed37850

Browse files
committed
Use T.TempDir() in tests.
1 parent 419cf3f commit ed37850

File tree

6 files changed

+14
-38
lines changed

6 files changed

+14
-38
lines changed

decompress_tar_test.go

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,11 @@ func TestTarLimits(t *testing.T) {
7878
t.Fatal(err)
7979
}
8080

81-
td, err := os.MkdirTemp("", "getter")
82-
if err != nil {
83-
t.Fatalf("err: %s", err)
84-
}
81+
td := t.TempDir()
8582

8683
tarFilePath := filepath.Join(td, "input.tar")
8784

88-
err = os.WriteFile(tarFilePath, b.Bytes(), 0666)
85+
err := os.WriteFile(tarFilePath, b.Bytes(), 0666)
8986
if err != nil {
9087
t.Fatalf("err: %s", err)
9188
}
@@ -129,15 +126,12 @@ func TestTarLimits(t *testing.T) {
129126

130127
// testDecompressPermissions decompresses a directory and checks the permissions of the expanded files
131128
func testDecompressorPermissions(t *testing.T, d Decompressor, input string, expected map[string]int, umask os.FileMode) {
132-
td, err := os.MkdirTemp("", "getter")
133-
if err != nil {
134-
t.Fatalf("err: %s", err)
135-
}
129+
td := t.TempDir()
136130

137131
// Destination is always joining result so that we have a new path
138132
dst := filepath.Join(td, "subdir", "result")
139133

140-
err = d.Decompress(dst, input, true, umask)
134+
err := d.Decompress(dst, input, true, umask)
141135
if err != nil {
142136
t.Fatalf("err: %s", err)
143137
}

decompress_zip_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,11 @@ func TestDecompressZipBomb(t *testing.T) {
165165
}
166166
}
167167

168-
td, err := os.MkdirTemp("", "go-getter-zip")
169-
if err != nil {
170-
t.Fatalf("err: %s", err)
171-
}
168+
td := t.TempDir()
172169

173170
zipFilePath := filepath.Join(td, "input.zip")
174171

175-
err = os.WriteFile(zipFilePath, buf.Bytes(), 0666)
172+
err := os.WriteFile(zipFilePath, buf.Bytes(), 0666)
176173
if err != nil {
177174
t.Fatalf("err: %s", err)
178175
}

get_file_unix_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,13 @@ import (
1212
// If a relative symlink is passed in as the pwd to Detect, the resulting URL
1313
// can have an invalid path.
1414
func TestFileDetector_relativeSymlink(t *testing.T) {
15-
tmpDir, err := os.MkdirTemp("", "go-getter")
16-
if err != nil {
17-
t.Fatal(err)
18-
}
15+
tmpDir := t.TempDir()
1916

2017
defer os.RemoveAll(tmpDir)
2118

2219
// We may have a symlinked tmp dir,
2320
// e.g. OSX uses /var -> /private/var
24-
tmpDir, err = filepath.EvalSymlinks(tmpDir)
21+
tmpDir, err := filepath.EvalSymlinks(tmpDir)
2522
if err != nil {
2623
t.Fatal(err)
2724
}

get_git_test.go

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -322,14 +322,11 @@ func TestGitGetter_gitVersion(t *testing.T) {
322322
if runtime.GOOS == "windows" {
323323
t.Skip("skipping on windows since the test requires sh")
324324
}
325-
dir, err := os.MkdirTemp("", "go-getter")
326-
if err != nil {
327-
t.Fatal(err)
328-
}
325+
dir := t.TempDir()
329326
defer os.RemoveAll(dir)
330327

331328
script := filepath.Join(dir, "git")
332-
err = os.WriteFile(
329+
err := os.WriteFile(
333330
script,
334331
[]byte("#!/bin/sh\necho \"git version 2.0 (Some Metadata Here)\n\""),
335332
0700)
@@ -998,10 +995,7 @@ type gitRepo struct {
998995

999996
// testGitRepo creates a new test git repository.
1000997
func testGitRepo(t *testing.T, name string) *gitRepo {
1001-
dir, err := os.MkdirTemp("", "go-getter")
1002-
if err != nil {
1003-
t.Fatal(err)
1004-
}
998+
dir := t.TempDir()
1005999
dir = filepath.Join(dir, name)
10061000
if err := os.Mkdir(dir, 0700); err != nil {
10071001
t.Fatal(err)

get_http_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -803,10 +803,7 @@ func TestHttpGetter_subdirLink(t *testing.T) {
803803
ln := testHttpServerSubDir(t)
804804
defer ln.Close()
805805

806-
dst, err := os.MkdirTemp("", "tf")
807-
if err != nil {
808-
t.Fatalf("err: %s", err)
809-
}
806+
dst := t.TempDir()
810807

811808
t.Logf("dst: %q", dst)
812809

@@ -828,7 +825,7 @@ func TestHttpGetter_subdirLink(t *testing.T) {
828825
GetMode: ModeAny,
829826
}
830827

831-
_, err = client.Get(ctx, &req)
828+
_, err := client.Get(ctx, &req)
832829
if err != nil {
833830
t.Fatalf("get err: %v", err)
834831
}

source_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,7 @@ func TestSourceDirSubdir(t *testing.T) {
5353
}
5454

5555
func TestSourceSubdirGlob(t *testing.T) {
56-
td, err := os.MkdirTemp("", "subdir-glob")
57-
if err != nil {
58-
t.Fatal(err)
59-
}
56+
td := t.TempDir()
6057
defer os.RemoveAll(td)
6158

6259
if err := os.Mkdir(filepath.Join(td, "subdir"), 0755); err != nil {

0 commit comments

Comments
 (0)