mirror of
https://github.com/status-im/consul.git
synced 2025-01-23 20:19:29 +00:00
Fix merge conflicts
This commit is contained in:
parent
655da1fc42
commit
7fa01105cc
@ -126,7 +126,7 @@ func TestClientConnPool_ForwardToLeader_Failover(t *testing.T) {
|
|||||||
var servers []testServer
|
var servers []testServer
|
||||||
for i := 0; i < count; i++ {
|
for i := 0; i < count; i++ {
|
||||||
name := fmt.Sprintf("server-%d", i)
|
name := fmt.Sprintf("server-%d", i)
|
||||||
srv := newTestServer(t, name, "dc1")
|
srv := newSimpleTestServer(t, name, "dc1")
|
||||||
res.AddServer(srv.Metadata())
|
res.AddServer(srv.Metadata())
|
||||||
servers = append(servers, srv)
|
servers = append(servers, srv)
|
||||||
t.Cleanup(srv.shutdown)
|
t.Cleanup(srv.shutdown)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user