Skip to content

Commit b61a377

Browse files
committed
Use T.TempDir() in tests.
1 parent 417cc0f commit b61a377

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
@@ -81,14 +81,11 @@ func TestTarLimits(t *testing.T) {
8181
t.Fatal(err)
8282
}
8383

84-
td, err := os.MkdirTemp("", "getter")
85-
if err != nil {
86-
t.Fatalf("err: %s", err)
87-
}
84+
td := t.TempDir()
8885

8986
tarFilePath := filepath.Join(td, "input.tar")
9087

91-
err = os.WriteFile(tarFilePath, b.Bytes(), 0666)
88+
err := os.WriteFile(tarFilePath, b.Bytes(), 0666)
9289
if err != nil {
9390
t.Fatalf("err: %s", err)
9491
}
@@ -132,15 +129,12 @@ func TestTarLimits(t *testing.T) {
132129

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

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

143-
err = d.Decompress(dst, input, true, umask)
137+
err := d.Decompress(dst, input, true, umask)
144138
if err != nil {
145139
t.Fatalf("err: %s", err)
146140
}

decompress_zip_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,11 @@ func TestDecompressZipBomb(t *testing.T) {
168168
}
169169
}
170170

171-
td, err := os.MkdirTemp("", "go-getter-zip")
172-
if err != nil {
173-
t.Fatalf("err: %s", err)
174-
}
171+
td := t.TempDir()
175172

176173
zipFilePath := filepath.Join(td, "input.zip")
177174

178-
err = os.WriteFile(zipFilePath, buf.Bytes(), 0666)
175+
err := os.WriteFile(zipFilePath, buf.Bytes(), 0666)
179176
if err != nil {
180177
t.Fatalf("err: %s", err)
181178
}

detect_file_unix_test.go

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

2219
defer os.RemoveAll(tmpDir)
2320

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

get_git_test.go

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -420,14 +420,11 @@ func TestGitGetter_gitVersion(t *testing.T) {
420420
if runtime.GOOS == "windows" {
421421
t.Skip("skipping on windows since the test requires sh")
422422
}
423-
dir, err := os.MkdirTemp("", "go-getter")
424-
if err != nil {
425-
t.Fatal(err)
426-
}
423+
dir := t.TempDir()
427424
defer os.RemoveAll(dir)
428425

429426
script := filepath.Join(dir, "git")
430-
err = os.WriteFile(
427+
err := os.WriteFile(
431428
script,
432429
[]byte("#!/bin/sh\necho \"git version 2.0 (Some Metadata Here)\n\""),
433430
0700)
@@ -1027,10 +1024,7 @@ type gitRepo struct {
10271024

10281025
// testGitRepo creates a new test git repository.
10291026
func testGitRepo(t *testing.T, name string) *gitRepo {
1030-
dir, err := os.MkdirTemp("", "go-getter")
1031-
if err != nil {
1032-
t.Fatal(err)
1033-
}
1027+
dir := t.TempDir()
10341028
dir = filepath.Join(dir, name)
10351029
if err := os.Mkdir(dir, 0700); err != nil {
10361030
t.Fatal(err)

get_http_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -760,10 +760,7 @@ func TestHttpGetter_subdirLink(t *testing.T) {
760760
defer ln.Close()
761761

762762
httpGetter := new(HttpGetter)
763-
dst, err := os.MkdirTemp("", "tf")
764-
if err != nil {
765-
t.Fatalf("err: %s", err)
766-
}
763+
dst := t.TempDir()
767764

768765
t.Logf("dst: %q", dst)
769766

@@ -783,7 +780,7 @@ func TestHttpGetter_subdirLink(t *testing.T) {
783780
},
784781
}
785782

786-
err = client.Get()
783+
err := client.Get()
787784
if err != nil {
788785
t.Fatalf("get err: %v", err)
789786
}

source_test.go

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

5858
func TestSourceSubdirGlob(t *testing.T) {
59-
td, err := os.MkdirTemp("", "subdir-glob")
60-
if err != nil {
61-
t.Fatal(err)
62-
}
59+
td := t.TempDir()
6360
defer os.RemoveAll(td)
6461

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

0 commit comments

Comments
 (0)