consul test fixes

allegro · Dec 10, 2015 · 9f102c9 · 9f102c9
1 parent 64bdd3b
commit 9f102c9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/consul/consul_test.go b/consul/consul_test.go
@@ -126,12 +126,12 @@ func TestRegisterServices_shouldReturnErrorOnFailure(t *testing.T) {
 	err := consul.Register(service)
 
 	// then
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 }
 
 func TestDeregisterServices(t *testing.T) {
 	t.Parallel()
-	server := CreateConsulTestServer("dc1", t)
+	server := CreateNamedConsulTestServer("localhost", "dc1", t)
 	defer server.Stop()
 
 	consul := ConsulClientAtServer(server)
@@ -153,7 +153,7 @@ func TestDeregisterServices(t *testing.T) {
 
 func TestDeregisterServices_shouldReturnErrorOnFailure(t *testing.T) {
 	t.Parallel()
-	server := CreateConsulTestServer("dc1", t)
+	server := CreateNamedConsulTestServer("localhost", "dc1", t)
 	defer server.Stop()
 
 	consul := ConsulClientAtServer(server)
@@ -166,7 +166,7 @@ func TestDeregisterServices_shouldReturnErrorOnFailure(t *testing.T) {
 	err := consul.Deregister("serviceA", server.Config.NodeName)
 
 	// then
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 }
 
 func serviceRegistration(name string, tags []string) *consulapi.AgentServiceRegistration {

diff --git a/consul/consul_test_server.go b/consul/consul_test_server.go
@@ -9,7 +9,13 @@ import (
 func CreateConsulTestServer(dc string, t *testing.T) *testutil.TestServer {
 	return testutil.NewTestServerConfig(t, func(c *testutil.TestServerConfig) {
 		c.Datacenter = dc
-		c.NodeName = "localhost"
+	})
+}
+
+func CreateNamedConsulTestServer(hostname string, dc string, t *testing.T) *testutil.TestServer {
+	return testutil.NewTestServerConfig(t, func(c *testutil.TestServerConfig) {
+		c.Datacenter = dc
+		c.NodeName = hostname
 	})
 }