From e5f65e5c7c37720a928923013eefe31c1984d0ed Mon Sep 17 00:00:00 2001 From: Sean Chittenden Date: Thu, 16 Jun 2016 21:21:39 -0700 Subject: [PATCH] Fix tests, don't take the address of DefaultConsulCommand() --- command/agent/agent_test.go | 2 +- command/agent/consul/syncer_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/command/agent/agent_test.go b/command/agent/agent_test.go index c7ee3e3ea..b36a84da1 100644 --- a/command/agent/agent_test.go +++ b/command/agent/agent_test.go @@ -42,7 +42,7 @@ func makeAgent(t testing.TB, cb func(*Config)) (string, *Agent) { Serf: getPort(), } conf.NodeName = fmt.Sprintf("Node %d", conf.Ports.RPC) - conf.Consul = &config.DefaultConsulConfig() + conf.Consul = config.DefaultConsulConfig() // Tighten the Serf timing config.SerfConfig.MemberlistConfig.SuspicionMult = 2 diff --git a/command/agent/consul/syncer_test.go b/command/agent/consul/syncer_test.go index 2d0e1da7a..3f644accd 100644 --- a/command/agent/consul/syncer_test.go +++ b/command/agent/consul/syncer_test.go @@ -46,7 +46,7 @@ func TestConsulServiceRegisterServices(t *testing.T) { t.Skip() shutdownCh := make(chan struct{}) - cs, err := NewSyncer(&config.DefaultConsulConfig(), shutdownCh, logger) + cs, err := NewSyncer(config.DefaultConsulConfig(), shutdownCh, logger) if err != nil { t.Fatalf("Err: %v", err) } @@ -82,7 +82,7 @@ func TestConsulServiceUpdateService(t *testing.T) { t.Skip() shutdownCh := make(chan struct{}) - cs, err := NewSyncer(&config.DefaultConsulConfig(), shutdownCh, logger) + cs, err := NewSyncer(config.DefaultConsulConfig(), shutdownCh, logger) if err != nil { t.Fatalf("Err: %v", err) }