diff --git a/sdk/testutil/README.md b/sdk/testutil/README.md index 2462d55dfb86..641e7f44adaf 100644 --- a/sdk/testutil/README.md +++ b/sdk/testutil/README.md @@ -27,7 +27,7 @@ import ( func TestFoo_bar(t *testing.T) { // Create a test Consul server - srv1, err := testutil.NewTestServer() + srv1, err := testutil.NewTestServerT(t) if err != nil { t.Fatal(err) } @@ -35,7 +35,7 @@ func TestFoo_bar(t *testing.T) { // Create a secondary server, passing in configuration // to avoid bootstrapping as we are forming a cluster. - srv2, err := testutil.NewTestServerConfig(t, func(c *testutil.TestServerConfig) { + srv2, err := testutil.NewTestServerConfigT(t, func(c *testutil.TestServerConfig) { c.Bootstrap = false }) if err != nil { diff --git a/sdk/testutil/server.go b/sdk/testutil/server.go index 6d01578a8b7e..6091754e1ded 100644 --- a/sdk/testutil/server.go +++ b/sdk/testutil/server.go @@ -211,12 +211,20 @@ type TestServer struct { tmpdir string } -// NewTestServer is an easy helper method to create a new Consul -// test server with the most basic configuration. +// Deprecated: Use NewTestServerT instead. func NewTestServer() (*TestServer, error) { return NewTestServerConfigT(nil, nil) } +// NewTestServerT is an easy helper method to create a new Consul +// test server with the most basic configuration. +func NewTestServerT(t *testing.T) (*TestServer, error) { + if t == nil { + return nil, errors.New("testutil: a non-nil *testing.T is required") + } + return NewTestServerConfigT(t, nil) +} + func NewTestServerConfig(cb ServerConfigCallback) (*TestServer, error) { return NewTestServerConfigT(nil, cb) }