Skip to content

Commit

Permalink
Use T.TempDir() in tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
tristanmorgan committed Apr 30, 2024
1 parent 9a1d9ee commit 3cb020e
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 38 deletions.
14 changes: 4 additions & 10 deletions decompress_tar_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,11 @@ func TestTarLimits(t *testing.T) {
t.Fatal(err)
}

td, err := os.MkdirTemp("", "getter")
if err != nil {
t.Fatalf("err: %s", err)
}
td := t.TempDir()

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

err = os.WriteFile(tarFilePath, b.Bytes(), 0666)
err := os.WriteFile(tarFilePath, b.Bytes(), 0666)
if err != nil {
t.Fatalf("err: %s", err)
}
Expand Down Expand Up @@ -129,15 +126,12 @@ func TestTarLimits(t *testing.T) {

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

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

err = d.Decompress(dst, input, true, umask)
err := d.Decompress(dst, input, true, umask)
if err != nil {
t.Fatalf("err: %s", err)
}
Expand Down
7 changes: 2 additions & 5 deletions decompress_zip_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,11 @@ func TestDecompressZipBomb(t *testing.T) {
}
}

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

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

err = os.WriteFile(zipFilePath, buf.Bytes(), 0666)
err := os.WriteFile(zipFilePath, buf.Bytes(), 0666)
if err != nil {
t.Fatalf("err: %s", err)
}
Expand Down
7 changes: 2 additions & 5 deletions get_file_unix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,13 @@ import (
// If a relative symlink is passed in as the pwd to Detect, the resulting URL
// can have an invalid path.
func TestFileDetector_relativeSymlink(t *testing.T) {
tmpDir, err := os.MkdirTemp("", "go-getter")
if err != nil {
t.Fatal(err)
}
tmpDir := t.TempDir()

defer os.RemoveAll(tmpDir)

// We may have a symlinked tmp dir,
// e.g. OSX uses /var -> /private/var
tmpDir, err = filepath.EvalSymlinks(tmpDir)
tmpDir, err := filepath.EvalSymlinks(tmpDir)
if err != nil {
t.Fatal(err)
}
Expand Down
12 changes: 3 additions & 9 deletions get_git_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -321,14 +321,11 @@ func TestGitGetter_gitVersion(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("skipping on windows since the test requires sh")
}
dir, err := os.MkdirTemp("", "go-getter")
if err != nil {
t.Fatal(err)
}
dir := t.TempDir()
defer os.RemoveAll(dir)

script := filepath.Join(dir, "git")
err = os.WriteFile(
err := os.WriteFile(
script,
[]byte("#!/bin/sh\necho \"git version 2.0 (Some Metadata Here)\n\""),
0700)
Expand Down Expand Up @@ -849,10 +846,7 @@ type gitRepo struct {

// testGitRepo creates a new test git repository.
func testGitRepo(t *testing.T, name string) *gitRepo {
dir, err := os.MkdirTemp("", "go-getter")
if err != nil {
t.Fatal(err)
}
dir := t.TempDir()
dir = filepath.Join(dir, name)
if err := os.Mkdir(dir, 0700); err != nil {
t.Fatal(err)
Expand Down
7 changes: 2 additions & 5 deletions get_http_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -803,10 +803,7 @@ func TestHttpGetter_subdirLink(t *testing.T) {
ln := testHttpServerSubDir(t)
defer ln.Close()

dst, err := os.MkdirTemp("", "tf")
if err != nil {
t.Fatalf("err: %s", err)
}
dst := t.TempDir()

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

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

_, err = client.Get(ctx, &req)
_, err := client.Get(ctx, &req)
if err != nil {
t.Fatalf("get err: %v", err)
}
Expand Down
5 changes: 1 addition & 4 deletions source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@ func TestSourceDirSubdir(t *testing.T) {
}

func TestSourceSubdirGlob(t *testing.T) {
td, err := os.MkdirTemp("", "subdir-glob")
if err != nil {
t.Fatal(err)
}
td := t.TempDir()
defer os.RemoveAll(td)

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

0 comments on commit 3cb020e

Please sign in to comment.