Cleanup tests (#92)

hashicorp · Oct 5, 2020 · 729720f · 729720f
1 parent 2f12ff0
commit 729720f
Show file tree

Hide file tree

Showing 17 changed files with 116 additions and 137 deletions.
diff --git a/tfexec/apply_test.go b/tfexec/apply_test.go
@@ -2,15 +2,13 @@ package tfexec
 
 import (
 	"context"
-	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-exec/tfexec/internal/testutil"
 )
 
 func TestApplyCmd(t *testing.T) {
 	td := testTempDir(t)
-	defer os.RemoveAll(td)
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
 	if err != nil {

diff --git a/tfexec/destroy_test.go b/tfexec/destroy_test.go
@@ -2,15 +2,13 @@ package tfexec
 
 import (
 	"context"
-	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-exec/tfexec/internal/testutil"
 )
 
 func TestDestroyCmd(t *testing.T) {
 	td := testTempDir(t)
-	defer os.RemoveAll(td)
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
 	if err != nil {

diff --git a/tfexec/fmt_test.go b/tfexec/fmt_test.go
@@ -3,13 +3,11 @@ package tfexec
 import (
 	"context"
 	"errors"
-	"os"
 	"testing"
 )
 
 func TestFormat(t *testing.T) {
 	td := testTempDir(t)
-	defer os.RemoveAll(td)
 
 	tf, err := NewTerraform(td, tfVersion(t, "0.7.6"))
 	if err != nil {

diff --git a/tfexec/import_test.go b/tfexec/import_test.go
@@ -2,15 +2,13 @@ package tfexec
 
 import (
 	"context"
-	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-exec/tfexec/internal/testutil"
 )
 
 func TestImportCmd(t *testing.T) {
 	td := testTempDir(t)
-	defer os.RemoveAll(td)
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
 	if err != nil {

diff --git a/tfexec/init_test.go b/tfexec/init_test.go
@@ -2,15 +2,13 @@ package tfexec
 
 import (
 	"context"
-	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-exec/tfexec/internal/testutil"
 )
 
 func TestInitCmd(t *testing.T) {
 	td := testTempDir(t)
-	defer os.RemoveAll(td)
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
 	if err != nil {

diff --git a/tfexec/internal/testutil/temp_dir.go b/tfexec/internal/testutil/temp_dir.go
@@ -0,0 +1,24 @@
+// +build go1.14
+
+package testutil
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+)
+
+// TODO: Remove once we drop support for Go <1.15
+// in favour of native t.TempDir()
+func TempDir(t *testing.T) string {
+	dir, err := ioutil.TempDir("", "tf")
+	if err != nil {
+		t.Fatalf("error creating temporary test directory: %s", err)
+	}
+
+	t.Cleanup(func() {
+		os.RemoveAll(dir)
+	})
+
+	return dir
+}
diff --git a/tfexec/internal/testutil/tfcache.go b/tfexec/internal/testutil/tfcache.go
@@ -1,11 +1,6 @@
 package testutil
 
 import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
 	"sync"
 	"testing"
 
@@ -49,42 +44,3 @@ func (tf *TFCache) Version(t *testing.T, v string) string {
 		return f
 	})
 }
-
-func (tf *TFCache) find(t *testing.T, key string, finder func(dir string) tfinstall.ExecPathFinder) string {
-	t.Helper()
-
-	if tf.dir == "" {
-		// panic instead of t.fatal as this is going to affect all downstream tests reusing the cache entry
-		panic("installDir not yet configured")
-	}
-
-	tf.Lock()
-	defer tf.Unlock()
-
-	if path, ok := tf.execs[key]; ok {
-		return path
-	}
-
-	keyDir := key
-	keyDir = strings.ReplaceAll(keyDir, ":", "-")
-	keyDir = strings.ReplaceAll(keyDir, "/", "-")
-
-	dir := filepath.Join(tf.dir, keyDir)
-
-	t.Logf("caching exec %q in dir %q", key, dir)
-
-	err := os.MkdirAll(dir, 0777)
-	if err != nil {
-		// panic instead of t.fatal as this is going to affect all downstream tests reusing the cache entry
-		panic(fmt.Sprintf("unable to mkdir %q: %s", dir, err))
-	}
-
-	path, err := tfinstall.Find(context.Background(), finder(dir))
-	if err != nil {
-		// panic instead of t.fatal as this is going to affect all downstream tests reusing the cache entry
-		panic(fmt.Sprintf("error installing terraform %q: %s", key, err))
-	}
-	tf.execs[key] = path
-
-	return path
-}
diff --git a/tfexec/internal/testutil/tfcache_find.go b/tfexec/internal/testutil/tfcache_find.go
@@ -0,0 +1,56 @@
+// +build go1.14
+
+package testutil
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/hashicorp/terraform-exec/tfinstall"
+)
+
+func (tf *TFCache) find(t *testing.T, key string, finder func(dir string) tfinstall.ExecPathFinder) string {
+	t.Helper()
+
+	if tf.dir == "" {
+		// panic instead of t.fatal as this is going to affect all downstream tests reusing the cache entry
+		panic("installDir not yet configured")
+	}
+
+	tf.Lock()
+	defer tf.Unlock()
+
+	if path, ok := tf.execs[key]; ok {
+		return path
+	}
+
+	keyDir := key
+	keyDir = strings.ReplaceAll(keyDir, ":", "-")
+	keyDir = strings.ReplaceAll(keyDir, "/", "-")
+
+	dir := filepath.Join(tf.dir, keyDir)
+
+	t.Logf("caching exec %q in dir %q", key, dir)
+
+	err := os.MkdirAll(dir, 0777)
+	if err != nil {
+		// panic instead of t.fatal as this is going to affect all downstream tests reusing the cache entry
+		panic(fmt.Sprintf("unable to mkdir %q: %s", dir, err))
+	}
+
+	ctx, cancelFunc := context.WithCancel(context.Background())
+	t.Cleanup(cancelFunc)
+
+	path, err := tfinstall.Find(ctx, finder(dir))
+	if err != nil {
+		// panic instead of t.fatal as this is going to affect all downstream tests reusing the cache entry
+		panic(fmt.Sprintf("error installing terraform %q: %s", key, err))
+	}
+	tf.execs[key] = path
+
+	return path
+}
diff --git a/tfexec/internal/testutil/tfcache_find_noop.go b/tfexec/internal/testutil/tfcache_find_noop.go
@@ -0,0 +1,14 @@
+// +build !go1.14
+
+package testutil
+
+import (
+	"runtime"
+	"testing"
+
+	"github.com/hashicorp/terraform-exec/tfinstall"
+)
+
+func (tf *TFCache) find(t *testing.T, key string, finder func(dir string) tfinstall.ExecPathFinder) string {
+	panic("not implemented for " + runtime.Version())
+}
diff --git a/tfexec/output_test.go b/tfexec/output_test.go
@@ -2,15 +2,13 @@ package tfexec
 
 import (
 	"context"
-	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-exec/tfexec/internal/testutil"
 )
 
 func TestOutputCmd(t *testing.T) {
 	td := testTempDir(t)
-	defer os.RemoveAll(td)
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
 	if err != nil {

diff --git a/tfexec/plan_test.go b/tfexec/plan_test.go
@@ -2,15 +2,13 @@ package tfexec
 
 import (
 	"context"
-	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-exec/tfexec/internal/testutil"
 )
 
 func TestPlanCmd(t *testing.T) {
 	td := testTempDir(t)
-	defer os.RemoveAll(td)
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
 	if err != nil {

diff --git a/tfexec/providers_schema_test.go b/tfexec/providers_schema_test.go
@@ -2,15 +2,13 @@ package tfexec
 
 import (
 	"context"
-	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-exec/tfexec/internal/testutil"
 )
 
 func TestProvidersSchemaCmd(t *testing.T) {
 	td := testTempDir(t)
-	defer os.RemoveAll(td)
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
 	if err != nil {

diff --git a/tfexec/refresh_test.go b/tfexec/refresh_test.go
@@ -2,15 +2,13 @@ package tfexec
 
 import (
 	"context"
-	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-exec/tfexec/internal/testutil"
 )
 
 func TestRefreshCmd(t *testing.T) {
 	td := testTempDir(t)
-	defer os.RemoveAll(td)
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest013))
 	if err != nil {

diff --git a/tfexec/show_test.go b/tfexec/show_test.go
@@ -2,15 +2,13 @@ package tfexec
 
 import (
 	"context"
-	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-exec/tfexec/internal/testutil"
 )
 
 func TestShowCmd(t *testing.T) {
 	td := testTempDir(t)
-	defer os.RemoveAll(td)
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
 	if err != nil {
@@ -32,7 +30,6 @@ func TestShowCmd(t *testing.T) {
 
 func TestShowStateFileCmd(t *testing.T) {
 	td := testTempDir(t)
-	defer os.RemoveAll(td)
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
 	if err != nil {
@@ -54,7 +51,6 @@ func TestShowStateFileCmd(t *testing.T) {
 
 func TestShowPlanFileCmd(t *testing.T) {
 	td := testTempDir(t)
-	defer os.RemoveAll(td)
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
 	if err != nil {
@@ -76,7 +72,6 @@ func TestShowPlanFileCmd(t *testing.T) {
 
 func TestShowPlanFileRawCmd(t *testing.T) {
 	td := testTempDir(t)
-	defer os.RemoveAll(td)
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
 	if err != nil {

diff --git a/tfexec/terraform_go113_test.go b/tfexec/terraform_go113_test.go