tests: Small helper function rename/refactor

This renames the internal test tempFile function to tempTestFile.

It also fixes some of the cleanup calls that were added - rather than
deleting the static file created only, it deletes the directory, which
is actually the specific temporary data created.

client_option_progress_test.go

@@ -4,6 +4,8 @@ import (
 	"io"
 	"net/http"
 	"net/http/httptest"
+	"os"
+	"path/filepath"
 	"sync"
 	"testing"
 )
@@ -35,15 +37,17 @@ func TestGet_progress(t *testing.T) {
 	defer s.Close()
 
 	{ // dl without tracking
-		dst := tempFile(t)
+		dst := tempTestFile(t)
+		defer os.RemoveAll(filepath.Dir(dst))
 		if err := GetFile(dst, s.URL+"/file?thig=this&that"); err != nil {
 			t.Fatalf("download failed: %v", err)
 		}
 	}
 
 	{ // tracking
 		p := &MockProgressTracking{}
-		dst := tempFile(t)
+		dst := tempTestFile(t)
+		defer os.RemoveAll(filepath.Dir(dst))
 		if err := GetFile(dst, s.URL+"/file?thig=this&that", WithProgress(p)); err != nil {
 			t.Fatalf("download failed: %v", err)
 		}

get_file_test.go

@@ -105,8 +105,8 @@ func TestFileGetter_dirSymlink(t *testing.T) {
 
 func TestFileGetter_GetFile(t *testing.T) {
 	g := new(FileGetter)
-	dst := tempFile(t)
-	defer os.Remove(dst)
+	dst := tempTestFile(t)
+	defer os.RemoveAll(filepath.Dir(dst))
 
 	// With a dir that doesn't exist
 	if err := g.GetFile(dst, testModuleURL("basic-file/foo.txt")); err != nil {
@@ -130,8 +130,8 @@ func TestFileGetter_GetFile_Copy(t *testing.T) {
 	g := new(FileGetter)
 	g.Copy = true
 
-	dst := tempFile(t)
-	defer os.Remove(dst)
+	dst := tempTestFile(t)
+	defer os.RemoveAll(filepath.Dir(dst))
 
 	// With a dir that doesn't exist
 	if err := g.GetFile(dst, testModuleURL("basic-file/foo.txt")); err != nil {

get_git_test.go

@@ -176,8 +176,8 @@ func TestGitGetter_GetFile(t *testing.T) {
 	}
 
 	g := new(GitGetter)
-	dst := tempFile(t)
-	defer os.Remove(dst)
+	dst := tempTestFile(t)
+	defer os.RemoveAll(filepath.Dir(dst))
 
 	repo := testGitRepo(t, "file")
 	repo.commitFile("file.txt", "hello")

get_hg_test.go

@@ -83,8 +83,8 @@ func TestHgGetter_GetFile(t *testing.T) {
 	}
 
 	g := new(HgGetter)
-	dst := tempFile(t)
-	defer os.Remove(dst)
+	dst := tempTestFile(t)
+	defer os.RemoveAll(filepath.Dir(dst))
 
 	// Download
 	if err := g.GetFile(dst, testModuleURL("basic-hg/foo.txt")); err != nil {

get_http_test.go

@@ -210,8 +210,8 @@ func TestHttpGetter_file(t *testing.T) {
 	defer ln.Close()
 
 	g := new(HttpGetter)
-	dst := tempFile(t)
-	defer os.RemoveAll(dst)
+	dst := tempTestFile(t)
+	defer os.RemoveAll(filepath.Dir(dst))
 
 	var u url.URL
 	u.Scheme = "http"

get_s3_test.go

@@ -63,8 +63,8 @@ func TestS3Getter_subdir(t *testing.T) {
 
 func TestS3Getter_GetFile(t *testing.T) {
 	g := new(S3Getter)
-	dst := tempFile(t)
-	defer os.Remove(dst)
+	dst := tempTestFile(t)
+	defer os.RemoveAll(filepath.Dir(dst))
 
 	// Download
 	err := g.GetFile(
@@ -82,8 +82,8 @@ func TestS3Getter_GetFile(t *testing.T) {
 
 func TestS3Getter_GetFile_badParams(t *testing.T) {
 	g := new(S3Getter)
-	dst := tempFile(t)
-	defer os.Remove(dst)
+	dst := tempTestFile(t)
+	defer os.RemoveAll(filepath.Dir(dst))
 
 	// Download
 	err := g.GetFile(
@@ -100,8 +100,8 @@ func TestS3Getter_GetFile_badParams(t *testing.T) {
 
 func TestS3Getter_GetFile_notfound(t *testing.T) {
 	g := new(S3Getter)
-	dst := tempFile(t)
-	defer os.Remove(dst)
+	dst := tempTestFile(t)
+	defer os.RemoveAll(filepath.Dir(dst))
 
 	// Download
 	err := g.GetFile(

get_test.go

@@ -224,8 +224,8 @@ func TestGetAny_dir(t *testing.T) {
 }
 
 func TestGetFile(t *testing.T) {
-	dst := tempFile(t)
-	defer os.Remove(dst)
+	dst := tempTestFile(t)
+	defer os.RemoveAll(filepath.Dir(dst))
 	u := testModule("basic-file/foo.txt")
 
 	if err := GetFile(dst, u); err != nil {
@@ -237,8 +237,8 @@ func TestGetFile(t *testing.T) {
 }
 
 func TestGetFile_archive(t *testing.T) {
-	dst := tempFile(t)
-	defer os.Remove(dst)
+	dst := tempTestFile(t)
+	defer os.RemoveAll(filepath.Dir(dst))
 	u := testModule("basic-file-archive/archive.tar.gz")
 
 	if err := GetFile(dst, u); err != nil {
@@ -250,8 +250,8 @@ func TestGetFile_archive(t *testing.T) {
 }
 
 func TestGetFile_archiveChecksum(t *testing.T) {
-	dst := tempFile(t)
-	defer os.Remove(dst)
+	dst := tempTestFile(t)
+	defer os.RemoveAll(filepath.Dir(dst))
 	u := testModule(
 		"basic-file-archive/archive.tar.gz?checksum=md5:fbd90037dacc4b1ab40811d610dde2f0")
 
@@ -264,8 +264,8 @@ func TestGetFile_archiveChecksum(t *testing.T) {
 }
 
 func TestGetFile_archiveNoUnarchive(t *testing.T) {
-	dst := tempFile(t)
-	defer os.Remove(dst)
+	dst := tempTestFile(t)
+	defer os.RemoveAll(filepath.Dir(dst))
 	u := testModule("basic-file-archive/archive.tar.gz")
 	u += "?archive=false"
 
@@ -352,8 +352,8 @@ func TestGetFile_checksum(t *testing.T) {
 		u := testModule("basic-file/foo.txt") + tc.Append
 
 		func() {
-			dst := tempFile(t)
-			defer os.Remove(dst)
+			dst := tempTestFile(t)
+			defer os.RemoveAll(filepath.Dir(dst))
 			if err := GetFile(dst, u); (err != nil) != tc.Err {
 				t.Fatalf("append: %s\n\nerr: %s", tc.Append, err)
 			}
@@ -432,8 +432,8 @@ func TestGetFile_checksum_from_file(t *testing.T) {
 	for _, tc := range cases {
 		u := checksums + "/content.txt" + tc.Append
 		t.Run(tc.Append, func(t *testing.T) {
-			dst := tempFile(t)
-			defer os.Remove(dst)
+			dst := tempTestFile(t)
+			defer os.RemoveAll(filepath.Dir(dst))
 			if err := GetFile(dst, u); (err != nil) != tc.WantErr {
 				t.Fatalf("append: %s\n\nerr: %s", tc.Append, err)
 			}
@@ -447,8 +447,8 @@ func TestGetFile_checksum_from_file(t *testing.T) {
 }
 
 func TestGetFile_checksumURL(t *testing.T) {
-	dst := tempFile(t)
-	defer os.Remove(dst)
+	dst := tempTestFile(t)
+	defer os.RemoveAll(filepath.Dir(dst))
 	u := testModule("basic-file/foo.txt") + "?checksum=md5:09f7e02f1290be211da707a266f153b3"
 
 	getter := &MockGetter{Proxy: new(FileGetter)}
@@ -487,8 +487,8 @@ func TestGetFile_filename(t *testing.T) {
 }
 
 func TestGetFile_checksumSkip(t *testing.T) {
-	dst := tempFile(t)
-	defer os.Remove(dst)
+	dst := tempTestFile(t)
+	defer os.RemoveAll(filepath.Dir(dst))
 	u := testModule("basic-file/foo.txt") + "?checksum=md5:09f7e02f1290be211da707a266f153b3"
 
 	getter := &MockGetter{Proxy: new(FileGetter)}

module_test.go

@@ -27,7 +27,7 @@ func tempDir(t *testing.T) string {
 	return dir
 }
 
-func tempFile(t *testing.T) string {
+func tempTestFile(t *testing.T) string {
 	dir := tempDir(t)
 	return filepath.Join(dir, "foo")
 }