consul/connect: fixup tests to use new consul sdk

hashicorp · Aug 24, 2020 · 83af3b8 · 83af3b8
1 parent f4ea3a5
commit 83af3b8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/client/allocrunner/groupservice_hook_test.go b/client/allocrunner/groupservice_hook_test.go
@@ -203,7 +203,7 @@ func TestGroupServiceHook_getWorkloadServices(t *testing.T) {
 // COMPAT(0.11) Only valid for upgrades from 0.8.
 func TestGroupServiceHook_Update08Alloc(t *testing.T) {
 	// Create an embedded Consul server
-	testconsul, err := ctestutil.NewTestServerConfig(func(c *ctestutil.TestServerConfig) {
+	testconsul, err := ctestutil.NewTestServerConfigT(t, func(c *ctestutil.TestServerConfig) {
 		// If -v wasn't specified squelch consul logging
 		if !testing.Verbose() {
 			c.Stdout = ioutil.Discard

diff --git a/client/allocrunner/taskrunner/connect_native_hook_test.go b/client/allocrunner/taskrunner/connect_native_hook_test.go
@@ -24,7 +24,7 @@ import (
 )
 
 func getTestConsul(t *testing.T) *consultest.TestServer {
-	testConsul, err := consultest.NewTestServerConfig(func(c *consultest.TestServerConfig) {
+	testConsul, err := consultest.NewTestServerConfigT(t, func(c *consultest.TestServerConfig) {
 		if !testing.Verbose() { // disable consul logging if -v not set
 			c.Stdout = ioutil.Discard
 			c.Stderr = ioutil.Discard

diff --git a/client/allocrunner/taskrunner/template/template_test.go b/client/allocrunner/taskrunner/template/template_test.go
@@ -154,7 +154,9 @@ func newTestHarness(t *testing.T, templates []*structs.Template, consul, vault b
 	harness.taskDir = d
 
 	if consul {
-		harness.consul, err = ctestutil.NewTestServer()
+		harness.consul, err = ctestutil.NewTestServerConfigT(t, func(c *ctestutil.TestServerConfig) {
+			// defaults
+		})
 		if err != nil {
 			t.Fatalf("error starting test Consul server: %v", err)
 		}

diff --git a/command/agent/consul/group_test.go b/command/agent/consul/group_test.go
@@ -16,7 +16,7 @@ import (
 
 func TestConsul_Connect(t *testing.T) {
 	// Create an embedded Consul server
-	testconsul, err := testutil.NewTestServerConfig(func(c *testutil.TestServerConfig) {
+	testconsul, err := testutil.NewTestServerConfigT(t, func(c *testutil.TestServerConfig) {
 		// If -v wasn't specified squelch consul logging
 		if !testing.Verbose() {
 			c.Stdout = ioutil.Discard