fix cleanup of acceptance test tmpdirs

kmoe · kmoe · commit 54e24732d21e · 2020-04-03T21:02:31.000+01:00
diff --git a/helper/resource/testing.go b/helper/resource/testing.go
@@ -108,10 +108,15 @@ func TestMain(m *testing.M) {
 			os.Exit(1)
 		}
 	} else {
+		exitCode := m.Run()
+
 		if acctest.TestHelper != nil {
-			defer acctest.TestHelper.Close()
+			err := acctest.TestHelper.Close()
+			if err != nil {
+				log.Printf("Error cleaning up temporary test files: %s", err)
+			}
 		}
-		os.Exit(m.Run())
+		os.Exit(exitCode)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -108,10 +108,15 @@ func TestMain(m *testing.M) {`
`108`	`108`	`os.Exit(1)`
`109`	`109`	`}`
`110`	`110`	`} else {`
	`111`	`+ exitCode := m.Run()`
	`112`	`+`
`111`	`113`	`if acctest.TestHelper != nil {`
`112`		`- defer acctest.TestHelper.Close()`
	`114`	`+ err := acctest.TestHelper.Close()`
	`115`	`+ if err != nil {`
	`116`	`+ log.Printf("Error cleaning up temporary test files: %s", err)`
	`117`	`+ }`
`113`	`118`	`}`
`114`		`- os.Exit(m.Run())`
	`119`	`+ os.Exit(exitCode)`
`115`	`120`	`}`
`116`	`121`	`}`
`117`	`122`