fix cleanup of acceptance test tmpdirs

kmoe · kmoe · commit e511b3d83524 · 2020-04-19T13:40:46.000+01:00
diff --git a/helper/resource/testing.go b/helper/resource/testing.go
@@ -100,8 +100,14 @@ func TestMain(m *testing.M) {
 		if acctest.TestHelper == nil {
 			log.Fatal("Please configure the acctest binary driver")
 		}
-		defer acctest.TestHelper.Close()
-		os.Exit(m.Run())
+
+		exitCode := m.Run()
+		err := acctest.TestHelper.Close()
+		if err != nil {
+			log.Printf("Error cleaning up temporary test files: %s", err)
+		}
+
+		os.Exit(exitCode)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,14 @@ func TestMain(m *testing.M) {`
`100`	`100`	`if acctest.TestHelper == nil {`
`101`	`101`	`log.Fatal("Please configure the acctest binary driver")`
`102`	`102`	`}`
`103`		`- defer acctest.TestHelper.Close()`
`104`		`- os.Exit(m.Run())`
	`103`	`+`
	`104`	`+ exitCode := m.Run()`
	`105`	`+ err := acctest.TestHelper.Close()`
	`106`	`+ if err != nil {`
	`107`	`+ log.Printf("Error cleaning up temporary test files: %s", err)`
	`108`	`+ }`
	`109`	`+`
	`110`	`+ os.Exit(exitCode)`
`105`	`111`	`}`
`106`	`112`	`}`
`107`	`113`