From d9d8b93c14227c8387d7c872b28471b2abec35f6 Mon Sep 17 00:00:00 2001
From: DanHam <DanHam@users.noreply.github.com>
Date: Wed, 9 May 2018 04:38:45 +0100
Subject: [PATCH] Remove tmp file created by common/ test. Avoid possible race
 condition.

---
 common/download_test.go | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/common/download_test.go b/common/download_test.go
index 8679b70e9..c9175b013 100644
--- a/common/download_test.go
+++ b/common/download_test.go
@@ -50,7 +50,7 @@ func TestDownloadClientVerifyChecksum(t *testing.T) {
 func TestDownloadClient_basic(t *testing.T) {
 	tf, _ := ioutil.TempFile("", "packer")
 	tf.Close()
-	os.Remove(tf.Name())
+	defer os.Remove(tf.Name())
 
 	ts := httptest.NewServer(http.FileServer(http.Dir("./test-fixtures/root")))
 	defer ts.Close()
@@ -60,7 +60,6 @@ func TestDownloadClient_basic(t *testing.T) {
 		TargetPath: tf.Name(),
 		CopyFile:   true,
 	})
-	defer os.Remove(tf.Name())
 
 	path, err := client.Get()
 	if err != nil {
@@ -85,7 +84,7 @@ func TestDownloadClient_checksumBad(t *testing.T) {
 
 	tf, _ := ioutil.TempFile("", "packer")
 	tf.Close()
-	os.Remove(tf.Name())
+	defer os.Remove(tf.Name())
 
 	ts := httptest.NewServer(http.FileServer(http.Dir("./test-fixtures/root")))
 	defer ts.Close()
@@ -97,7 +96,7 @@ func TestDownloadClient_checksumBad(t *testing.T) {
 		Checksum:   checksum,
 		CopyFile:   true,
 	})
-	defer os.Remove(tf.Name())
+
 	if _, err := client.Get(); err == nil {
 		t.Fatal("should error")
 	}
@@ -111,7 +110,7 @@ func TestDownloadClient_checksumGood(t *testing.T) {
 
 	tf, _ := ioutil.TempFile("", "packer")
 	tf.Close()
-	os.Remove(tf.Name())
+	defer os.Remove(tf.Name())
 
 	ts := httptest.NewServer(http.FileServer(http.Dir("./test-fixtures/root")))
 	defer ts.Close()
@@ -123,7 +122,7 @@ func TestDownloadClient_checksumGood(t *testing.T) {
 		Checksum:   checksum,
 		CopyFile:   true,
 	})
-	defer os.Remove(tf.Name())
+
 	path, err := client.Get()
 	if err != nil {
 		t.Fatalf("err: %s", err)
@@ -176,7 +175,7 @@ func TestDownloadClient_checksumNoDownload(t *testing.T) {
 func TestDownloadClient_notFound(t *testing.T) {
 	tf, _ := ioutil.TempFile("", "packer")
 	tf.Close()
-	os.Remove(tf.Name())
+	defer os.Remove(tf.Name())
 
 	ts := httptest.NewServer(http.FileServer(http.Dir("./test-fixtures/root")))
 	defer ts.Close()
@@ -195,6 +194,7 @@ func TestDownloadClient_resume(t *testing.T) {
 	tf, _ := ioutil.TempFile("", "packer")
 	tf.Write([]byte("w"))
 	tf.Close()
+	defer os.Remove(tf.Name())
 
 	ts := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
 		if r.Method == "HEAD" {
@@ -212,7 +212,7 @@ func TestDownloadClient_resume(t *testing.T) {
 		TargetPath: tf.Name(),
 		CopyFile:   true,
 	})
-	defer os.Remove(tf.Name())
+
 	path, err := client.Get()
 	if err != nil {
 		t.Fatalf("err: %s", err)
@@ -234,7 +234,7 @@ func TestDownloadClient_usesDefaultUserAgent(t *testing.T) {
 		t.Fatalf("tempfile error: %s", err)
 	}
 	tf.Close()
-	os.Remove(tf.Name())
+	defer os.Remove(tf.Name())
 
 	defaultUserAgent := ""
 	asserted := false
@@ -272,7 +272,6 @@ func TestDownloadClient_usesDefaultUserAgent(t *testing.T) {
 		TargetPath: tf.Name(),
 		CopyFile:   true,
 	}
-	defer os.Remove(tf.Name())
 
 	client := NewDownloadClient(config)
 	_, err = client.Get()
@@ -291,7 +290,7 @@ func TestDownloadClient_setsUserAgent(t *testing.T) {
 		t.Fatalf("tempfile error: %s", err)
 	}
 	tf.Close()
-	os.Remove(tf.Name())
+	defer os.Remove(tf.Name())
 
 	asserted := false
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -306,7 +305,6 @@ func TestDownloadClient_setsUserAgent(t *testing.T) {
 		UserAgent:  "fancy user agent",
 		CopyFile:   true,
 	}
-	defer os.Remove(tf.Name())
 
 	client := NewDownloadClient(config)
 	_, err = client.Get()