Skip to content

Commit 52a020b

Browse files
committed
Use T.TempDir() in tests.
1 parent 2998647 commit 52a020b

6 files changed

+14
-38
lines changed

Diff for: decompress_tar_test.go

+4-10
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
}

Diff for: decompress_zip_test.go

+2-5
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
}

Diff for: detect_file_unix_test.go

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

1916
defer os.RemoveAll(tmpDir)
2017

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

Diff for: get_git_test.go

+3-9
Original file line numberDiff line numberDiff line change
@@ -417,14 +417,11 @@ func TestGitGetter_gitVersion(t *testing.T) {
417417
if runtime.GOOS == "windows" {
418418
t.Skip("skipping on windows since the test requires sh")
419419
}
420-
dir, err := os.MkdirTemp("", "go-getter")
421-
if err != nil {
422-
t.Fatal(err)
423-
}
420+
dir := t.TempDir()
424421
defer os.RemoveAll(dir)
425422

426423
script := filepath.Join(dir, "git")
427-
err = os.WriteFile(
424+
err := os.WriteFile(
428425
script,
429426
[]byte("#!/bin/sh\necho \"git version 2.0 (Some Metadata Here)\n\""),
430427
0700)
@@ -992,10 +989,7 @@ type gitRepo struct {
992989

993990
// testGitRepo creates a new test git repository.
994991
func testGitRepo(t *testing.T, name string) *gitRepo {
995-
dir, err := os.MkdirTemp("", "go-getter")
996-
if err != nil {
997-
t.Fatal(err)
998-
}
992+
dir := t.TempDir()
999993
dir = filepath.Join(dir, name)
1000994
if err := os.Mkdir(dir, 0700); err != nil {
1001995
t.Fatal(err)

Diff for: get_http_test.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -757,10 +757,7 @@ func TestHttpGetter_subdirLink(t *testing.T) {
757757
defer ln.Close()
758758

759759
httpGetter := new(HttpGetter)
760-
dst, err := os.MkdirTemp("", "tf")
761-
if err != nil {
762-
t.Fatalf("err: %s", err)
763-
}
760+
dst := t.TempDir()
764761

765762
t.Logf("dst: %q", dst)
766763

@@ -780,7 +777,7 @@ func TestHttpGetter_subdirLink(t *testing.T) {
780777
},
781778
}
782779

783-
err = client.Get()
780+
err := client.Get()
784781
if err != nil {
785782
t.Fatalf("get err: %v", err)
786783
}

Diff for: source_test.go

+1-4
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)