resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

convert the consul backend to use consul/testutil 

Start up our own consul server for unit tests.
This commit is contained in:
James Bardin 2017-03-13 18:25:58 -04:00
parent 54224eb41e
commit 90055c6ae2
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/remote-state/consul/backend_test.go
View File

@ -2,10 +2,10 @@ package consul
import ( import (
"fmt" "fmt"
"os"
"testing" "testing"
"time" "time"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/backend"
) )
@ -14,15 +14,12 @@ func TestBackend_impl(t *testing.T) {
} }
func TestBackend(t *testing.T) { func TestBackend(t *testing.T) {
addr := os.Getenv("CONSUL_HTTP_ADDR") srv := testutil.NewTestServer(t)
if addr == "" { defer srv.Stop()
t.Log("consul tests require CONSUL_HTTP_ADDR")
t.Skip()
}
// Get the backend // Get the backend
b := backend.TestBackendConfig(t, New(), map[string]interface{}{ b := backend.TestBackendConfig(t, New(), map[string]interface{}{
"address": addr, "address": srv.HTTPAddr,
"path": fmt.Sprintf("tf-unit/%s", time.Now().String()), "path": fmt.Sprintf("tf-unit/%s", time.Now().String()),
}) })

22
backend/remote-state/consul/client_test.go
View File

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