From ad0ce49cec1c998fe4fbb9921385964e164a59ab Mon Sep 17 00:00:00 2001
From: Adrien Delorme <adrien.delorme@icloud.com>
Date: Thu, 11 Feb 2021 15:17:05 +0100
Subject: [PATCH] fix tmpdir creation

---
 command/init_test.go  | 16 ++++++++--------
 command/utils_test.go |  3 ---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/command/init_test.go b/command/init_test.go
index c00a5a054..ff3791371 100644
--- a/command/init_test.go
+++ b/command/init_test.go
@@ -213,8 +213,8 @@ func TestInitCommand_Run(t *testing.T) {
 						}
 					}`,
 			},
-			cfg.dir("3_pkr_config"),
-			cfg.dir("3_pkr_user_folder"),
+			cfg.dir("4_pkr_config"),
+			cfg.dir("4_pkr_user_folder"),
 			1,
 			nil,
 			"h1:47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=",
@@ -223,6 +223,12 @@ func TestInitCommand_Run(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Cleanup(func() {
+				_ = os.RemoveAll(tt.packerConfigDir)
+			})
+			t.Cleanup(func() {
+				_ = os.RemoveAll(tt.packerUserFolder)
+			})
 			for _, init := range tt.init {
 				init(t, tt)
 				if t.Skipped() {
@@ -231,13 +237,7 @@ func TestInitCommand_Run(t *testing.T) {
 			}
 			log.Printf("starting %s", tt.name)
 			createFiles(tt.packerConfigDir, tt.inPluginFolder)
-			t.Cleanup(func() {
-				_ = os.RemoveAll(tt.packerConfigDir)
-			})
 			createFiles(tt.packerUserFolder, tt.inConfigFolder)
-			t.Cleanup(func() {
-				_ = os.RemoveAll(tt.packerUserFolder)
-			})
 
 			hash, err := dirhash.HashDir(tt.packerConfigDir, "", dirhash.DefaultHash)
 			if err != nil {
diff --git a/command/utils_test.go b/command/utils_test.go
index 81dcf9e05..f381b2e98 100644
--- a/command/utils_test.go
+++ b/command/utils_test.go
@@ -15,9 +15,6 @@ func mustString(s string, e error) string {
 }
 
 func createFiles(dir string, content map[string]string) {
-	if err := os.MkdirAll(dir, 0777); err != nil {
-		panic(err)
-	}
 	for relPath, content := range content {
 		contentPath := filepath.Join(dir, relPath)
 		if err := os.MkdirAll(filepath.Dir(contentPath), 0777); err != nil {