Revert "merge tmpFile and tempFile usages"

This reverts commit 7607f9c.

The old test tempFile function is not general purpose and sets up a
static file within a directory created by the tempDir helper. This
functionality needs to be preserved, so the correct plan of action would
be to preserve this functionality while moving the function name to
another, logical name such as tempTestFile.

checksum.go

@@ -172,7 +172,7 @@ func (c *Client) checksumFromFile(checksumFile string, src *url.URL) (*fileCheck
 		return nil, err
 	}
 
-	tempfile, err := tempFile("", filepath.Base(checksumFileURL.Path))
+	tempfile, err := tmpFile("", filepath.Base(checksumFileURL.Path))
 	if err != nil {
 		return nil, err
 	}

client_option_progress_test.go

@@ -35,15 +35,15 @@ func TestGet_progress(t *testing.T) {
 	defer s.Close()
 
 	{ // dl without tracking
-		dst := mustString(tempFile("", ""))
+		dst := tempFile(t)
 		if err := GetFile(dst, s.URL+"/file?thig=this&that"); err != nil {
 			t.Fatalf("download failed: %v", err)
 		}
 	}
 
 	{ // tracking
 		p := &MockProgressTracking{}
-		dst := mustString(tempFile("", ""))
+		dst := tempFile(t)
 		if err := GetFile(dst, s.URL+"/file?thig=this&that", WithProgress(p)); err != nil {
 			t.Fatalf("download failed: %v", err)
 		}

common.go

@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 )
 
-func tempFile(dir, pattern string) (string, error) {
+func tmpFile(dir, pattern string) (string, error) {
 	f, err := ioutil.TempFile(dir, pattern)
 	if err != nil {
 		return "", err

get_file_test.go

@@ -105,7 +105,7 @@ func TestFileGetter_dirSymlink(t *testing.T) {
 
 func TestFileGetter_GetFile(t *testing.T) {
 	g := new(FileGetter)
-	dst := mustString(tempFile("", ""))
+	dst := tempFile(t)
 	defer os.Remove(dst)
 
 	// With a dir that doesn't exist
@@ -130,7 +130,7 @@ func TestFileGetter_GetFile_Copy(t *testing.T) {
 	g := new(FileGetter)
 	g.Copy = true
 
-	dst := mustString(tempFile("", ""))
+	dst := tempFile(t)
 	defer os.Remove(dst)
 
 	// With a dir that doesn't exist

get_git_test.go

@@ -176,7 +176,7 @@ func TestGitGetter_GetFile(t *testing.T) {
 	}
 
 	g := new(GitGetter)
-	dst := mustString(tempFile("", ""))
+	dst := tempFile(t)
 	defer os.Remove(dst)
 
 	repo := testGitRepo(t, "file")

get_hg_test.go

@@ -83,7 +83,7 @@ func TestHgGetter_GetFile(t *testing.T) {
 	}
 
 	g := new(HgGetter)
-	dst := mustString(tempFile("", ""))
+	dst := tempFile(t)
 	defer os.Remove(dst)
 
 	// Download

get_http_test.go

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

get_s3_test.go

@@ -63,7 +63,7 @@ func TestS3Getter_subdir(t *testing.T) {
 
 func TestS3Getter_GetFile(t *testing.T) {
 	g := new(S3Getter)
-	dst := mustString(tempFile("", ""))
+	dst := tempFile(t)
 	defer os.Remove(dst)
 
 	// Download
@@ -82,7 +82,7 @@ func TestS3Getter_GetFile(t *testing.T) {
 
 func TestS3Getter_GetFile_badParams(t *testing.T) {
 	g := new(S3Getter)
-	dst := mustString(tempFile("", ""))
+	dst := tempFile(t)
 	defer os.Remove(dst)
 
 	// Download
@@ -100,7 +100,7 @@ func TestS3Getter_GetFile_badParams(t *testing.T) {
 
 func TestS3Getter_GetFile_notfound(t *testing.T) {
 	g := new(S3Getter)
-	dst := mustString(tempFile("", ""))
+	dst := tempFile(t)
 	defer os.Remove(dst)
 
 	// Download

get_test.go

@@ -224,7 +224,7 @@ func TestGetAny_dir(t *testing.T) {
 }
 
 func TestGetFile(t *testing.T) {
-	dst := mustString(tempFile("", ""))
+	dst := tempFile(t)
 	defer os.Remove(dst)
 	u := testModule("basic-file/foo.txt")
 
@@ -237,7 +237,7 @@ func TestGetFile(t *testing.T) {
 }
 
 func TestGetFile_archive(t *testing.T) {
-	dst := mustString(tempFile("", ""))
+	dst := tempFile(t)
 	defer os.Remove(dst)
 	u := testModule("basic-file-archive/archive.tar.gz")
 
@@ -250,7 +250,7 @@ func TestGetFile_archive(t *testing.T) {
 }
 
 func TestGetFile_archiveChecksum(t *testing.T) {
-	dst := mustString(tempFile("", ""))
+	dst := tempFile(t)
 	defer os.Remove(dst)
 	u := testModule(
 		"basic-file-archive/archive.tar.gz?checksum=md5:fbd90037dacc4b1ab40811d610dde2f0")
@@ -264,7 +264,7 @@ func TestGetFile_archiveChecksum(t *testing.T) {
 }
 
 func TestGetFile_archiveNoUnarchive(t *testing.T) {
-	dst := mustString(tempFile("", ""))
+	dst := tempFile(t)
 	defer os.Remove(dst)
 	u := testModule("basic-file-archive/archive.tar.gz")
 	u += "?archive=false"
@@ -352,7 +352,7 @@ func TestGetFile_checksum(t *testing.T) {
 		u := testModule("basic-file/foo.txt") + tc.Append
 
 		func() {
-			dst := mustString(tempFile("", ""))
+			dst := tempFile(t)
 			defer os.Remove(dst)
 			if err := GetFile(dst, u); (err != nil) != tc.Err {
 				t.Fatalf("append: %s\n\nerr: %s", tc.Append, err)
@@ -432,7 +432,7 @@ 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 := mustString(tempFile("", ""))
+			dst := tempFile(t)
 			defer os.Remove(dst)
 			if err := GetFile(dst, u); (err != nil) != tc.WantErr {
 				t.Fatalf("append: %s\n\nerr: %s", tc.Append, err)
@@ -447,7 +447,7 @@ func TestGetFile_checksum_from_file(t *testing.T) {
 }
 
 func TestGetFile_checksumURL(t *testing.T) {
-	dst := mustString(tempFile("", ""))
+	dst := tempFile(t)
 	defer os.Remove(dst)
 	u := testModule("basic-file/foo.txt") + "?checksum=md5:09f7e02f1290be211da707a266f153b3"
 
@@ -487,7 +487,7 @@ func TestGetFile_filename(t *testing.T) {
 }
 
 func TestGetFile_checksumSkip(t *testing.T) {
-	dst := mustString(tempFile("", ""))
+	dst := tempFile(t)
 	defer os.Remove(dst)
 	u := testModule("basic-file/foo.txt") + "?checksum=md5:09f7e02f1290be211da707a266f153b3"
 

module_test.go

@@ -27,11 +27,9 @@ func tempDir(t *testing.T) string {
 	return dir
 }
 
-func mustString(s string, err error) string {
-	if err != nil {
-		panic("err: " + err.Error())
-	}
-	return s
+func tempFile(t *testing.T) string {
+	dir := tempDir(t)
+	return filepath.Join(dir, "foo")
 }
 
 func testModule(n string) string {