From 54dc50ec5cdcada22d4a27230bdaf3f0514795f2 Mon Sep 17 00:00:00 2001
From: Bruno Miguel Custodio <brunomcustodio@gmail.com>
Date: Fri, 8 Sep 2017 22:49:23 +0100
Subject: [PATCH] Cleanup 'etcd' after every test.

---
 backend/remote-state/etcdv3/backend_test.go | 20 ++++++++++++--------
 backend/remote-state/etcdv3/client_test.go  |  9 +++------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/backend/remote-state/etcdv3/backend_test.go b/backend/remote-state/etcdv3/backend_test.go
index ded8f4ae3b..4b9b88dbca 100644
--- a/backend/remote-state/etcdv3/backend_test.go
+++ b/backend/remote-state/etcdv3/backend_test.go
@@ -24,13 +24,7 @@ func TestBackend_impl(t *testing.T) {
 	var _ backend.Backend = new(Backend)
 }
 
-func prepareEtcdv3(t *testing.T) {
-	skip := os.Getenv("TF_ACC") == "" && os.Getenv("TF_ETCDV3_TEST") == ""
-	if skip {
-		t.Log("etcd server tests require setting TF_ACC or TF_ETCDV3_TEST")
-		t.Skip()
-	}
-
+func cleanupEtcdv3(t *testing.T) {
 	client, err := etcdv3.New(etcdv3.Config{
 		Endpoints: etcdv3Endpoints,
 	})
@@ -42,12 +36,21 @@ func prepareEtcdv3(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-
 	t.Logf("Cleaned up %d keys.", res.Deleted)
 }
 
+func prepareEtcdv3(t *testing.T) {
+	skip := os.Getenv("TF_ACC") == "" && os.Getenv("TF_ETCDV3_TEST") == ""
+	if skip {
+		t.Log("etcd server tests require setting TF_ACC or TF_ETCDV3_TEST")
+		t.Skip()
+	}
+	cleanupEtcdv3(t)
+}
+
 func TestBackend(t *testing.T) {
 	prepareEtcdv3(t)
+	defer cleanupEtcdv3(t)
 
 	prefix := fmt.Sprintf("%s/%s/", keyPrefix, time.Now().Format(time.RFC3339))
 
@@ -68,6 +71,7 @@ func TestBackend(t *testing.T) {
 
 func TestBackend_lockDisabled(t *testing.T) {
 	prepareEtcdv3(t)
+	defer cleanupEtcdv3(t)
 
 	prefix := fmt.Sprintf("%s/%s/", keyPrefix, time.Now().Format(time.RFC3339))
 
diff --git a/backend/remote-state/etcdv3/client_test.go b/backend/remote-state/etcdv3/client_test.go
index 0bd39a6638..f30a25b5b1 100644
--- a/backend/remote-state/etcdv3/client_test.go
+++ b/backend/remote-state/etcdv3/client_test.go
@@ -17,6 +17,7 @@ func TestRemoteClient_impl(t *testing.T) {
 
 func TestRemoteClient(t *testing.T) {
 	prepareEtcdv3(t)
+	defer cleanupEtcdv3(t)
 
 	prefix := fmt.Sprintf("%s/%s/", keyPrefix, time.Now().Format(time.RFC3339))
 
@@ -38,6 +39,7 @@ func TestRemoteClient(t *testing.T) {
 
 func TestEtcdv3_stateLock(t *testing.T) {
 	prepareEtcdv3(t)
+	defer cleanupEtcdv3(t)
 
 	prefix := fmt.Sprintf("%s/%s/", keyPrefix, time.Now().Format(time.RFC3339))
 
@@ -63,6 +65,7 @@ func TestEtcdv3_stateLock(t *testing.T) {
 
 func TestEtcdv3_destroyLock(t *testing.T) {
 	prepareEtcdv3(t)
+	defer cleanupEtcdv3(t)
 
 	prefix := fmt.Sprintf("%s/%s/", keyPrefix, time.Now().Format(time.RFC3339))
 
@@ -97,10 +100,4 @@ func TestEtcdv3_destroyLock(t *testing.T) {
 	if res.Count != 0 {
 		t.Fatalf("lock key not cleaned up at: %s", string(res.Kvs[0].Key))
 	}
-
-	// Cleanup leftover state.
-	c.Client.KV.Delete(context.TODO(), c.Key)
-	if err != nil {
-		t.Fatal(err)
-	}
 }