From 90055c6ae2dd36358270888b92d945de9434bcfb Mon Sep 17 00:00:00 2001
From: James Bardin <j.bardin@gmail.com>
Date: Mon, 13 Mar 2017 18:25:58 -0400
Subject: [PATCH] convert the consul backend to use consul/testutil

Start up our own consul server for unit tests.
---
 backend/remote-state/consul/backend_test.go | 11 ++++-------
 backend/remote-state/consul/client_test.go  | 22 ++++++++-------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/backend/remote-state/consul/backend_test.go b/backend/remote-state/consul/backend_test.go
index fb2c0e0f6..2fcb1c6a7 100644
--- a/backend/remote-state/consul/backend_test.go
+++ b/backend/remote-state/consul/backend_test.go
@@ -2,10 +2,10 @@ package consul
 
 import (
 	"fmt"
-	"os"
 	"testing"
 	"time"
 
+	"github.com/hashicorp/consul/testutil"
 	"github.com/hashicorp/terraform/backend"
 )
 
@@ -14,15 +14,12 @@ func TestBackend_impl(t *testing.T) {
 }
 
 func TestBackend(t *testing.T) {
-	addr := os.Getenv("CONSUL_HTTP_ADDR")
-	if addr == "" {
-		t.Log("consul tests require CONSUL_HTTP_ADDR")
-		t.Skip()
-	}
+	srv := testutil.NewTestServer(t)
+	defer srv.Stop()
 
 	// Get the backend
 	b := backend.TestBackendConfig(t, New(), map[string]interface{}{
-		"address": addr,
+		"address": srv.HTTPAddr,
 		"path":    fmt.Sprintf("tf-unit/%s", time.Now().String()),
 	})
 
diff --git a/backend/remote-state/consul/client_test.go b/backend/remote-state/consul/client_test.go
index d123e39c7..6109c4c0f 100644
--- a/backend/remote-state/consul/client_test.go
+++ b/backend/remote-state/consul/client_test.go
@@ -2,10 +2,10 @@ package consul
 
 import (
 	"fmt"
-	"os"
 	"testing"
 	"time"
 
+	"github.com/hashicorp/consul/testutil"
 	"github.com/hashicorp/terraform/backend"
 	"github.com/hashicorp/terraform/state/remote"
 )
@@ -16,15 +16,12 @@ func TestRemoteClient_impl(t *testing.T) {
 }
 
 func TestRemoteClient(t *testing.T) {
-	addr := os.Getenv("CONSUL_HTTP_ADDR")
-	if addr == "" {
-		t.Log("consul tests require CONSUL_HTTP_ADDR")
-		t.Skip()
-	}
+	srv := testutil.NewTestServer(t)
+	defer srv.Stop()
 
 	// Get the backend
 	b := backend.TestBackendConfig(t, New(), map[string]interface{}{
-		"address": addr,
+		"address": srv.HTTPAddr,
 		"path":    fmt.Sprintf("tf-unit/%s", time.Now().String()),
 	})
 
@@ -39,17 +36,14 @@ func TestRemoteClient(t *testing.T) {
 }
 
 func TestConsul_stateLock(t *testing.T) {
-	addr := os.Getenv("CONSUL_HTTP_ADDR")
-	if addr == "" {
-		t.Log("consul lock tests require CONSUL_HTTP_ADDR")
-		t.Skip()
-	}
+	srv := testutil.NewTestServer(t)
+	defer srv.Stop()
 
 	path := fmt.Sprintf("tf-unit/%s", time.Now().String())
 
 	// create 2 instances to get 2 remote.Clients
 	sA, err := backend.TestBackendConfig(t, New(), map[string]interface{}{
-		"address": addr,
+		"address": srv.HTTPAddr,
 		"path":    path,
 	}).State(backend.DefaultStateName)
 	if err != nil {
@@ -57,7 +51,7 @@ func TestConsul_stateLock(t *testing.T) {
 	}
 
 	sB, err := backend.TestBackendConfig(t, New(), map[string]interface{}{
-		"address": addr,
+		"address": srv.HTTPAddr,
 		"path":    path,
 	}).State(backend.DefaultStateName)
 	if err != nil {