status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge Consul OSS branch 'master' at commit a1725e6b52

This commit is contained in:
hashicorp-ci 2019-07-30 02:00:29 +00:00
parent 5288dec952 a1725e6b52
commit 847b90288a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/status_endpoint_test.go
View File

@ -48,6 +48,9 @@ func TestStatusLeaderSecondary(t *testing.T) {
require.Len(r, a2.WANMembers(), 2) require.Len(r, a2.WANMembers(), 2)
}) })
testrpc.WaitForLeader(t, a1.RPC, "secondary")
testrpc.WaitForLeader(t, a2.RPC, "primary")
req, _ := http.NewRequest("GET", "/v1/status/leader?dc=secondary", nil) req, _ := http.NewRequest("GET", "/v1/status/leader?dc=secondary", nil)
obj, err := a1.srv.StatusLeader(nil, req) obj, err := a1.srv.StatusLeader(nil, req)
require.NoError(t, err) require.NoError(t, err)
@ -101,6 +104,9 @@ func TestStatusPeersSecondary(t *testing.T) {
require.Len(r, a2.WANMembers(), 2) require.Len(r, a2.WANMembers(), 2)
}) })
testrpc.WaitForLeader(t, a1.RPC, "secondary")
testrpc.WaitForLeader(t, a2.RPC, "primary")
req, _ := http.NewRequest("GET", "/v1/status/peers?dc=secondary", nil) req, _ := http.NewRequest("GET", "/v1/status/peers?dc=secondary", nil)
obj, err := a1.srv.StatusPeers(nil, req) obj, err := a1.srv.StatusPeers(nil, req)
require.NoError(t, err) require.NoError(t, err)