Fix tests, don't take the address of DefaultConsulCommand()

This commit is contained in:
Sean Chittenden
2016-06-16 21:21:39 -07:00
parent 105ba1f177
commit e5f65e5c7c
2 changed files with 3 additions and 3 deletions

View File

@@ -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

View File

@@ -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)
}