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

Merge pull request #1859 from hashicorp/b-flaky-coord-tests 

Increases timeouts for coordinate tests.
This commit is contained in:
James Phillips 2016-03-21 17:10:01 -07:00
parent e60a095207 fffa8d5061
commit 8211c34924
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
consul/coordinate_endpoint_test.go
View File

@ -118,7 +118,7 @@ func TestCoordinate_Update(t *testing.T) {
} }
// Wait a while and the updates should get picked up. // Wait a while and the updates should get picked up.
time.Sleep(2 * s1.config.CoordinateUpdatePeriod) time.Sleep(3 * s1.config.CoordinateUpdatePeriod)
c, err = state.CoordinateGetRaw("node1") c, err = state.CoordinateGetRaw("node1")
if err != nil { if err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
@ -163,7 +163,7 @@ func TestCoordinate_Update(t *testing.T) {
// Wait a little while for the batch routine to run, then make sure // Wait a little while for the batch routine to run, then make sure
// exactly one of the updates got dropped (we won't know which one). // exactly one of the updates got dropped (we won't know which one).
time.Sleep(2 * s1.config.CoordinateUpdatePeriod) time.Sleep(3 * s1.config.CoordinateUpdatePeriod)
numDropped := 0 numDropped := 0
for i := 0; i < spamLen; i++ { for i := 0; i < spamLen; i++ {
c, err = state.CoordinateGetRaw(fmt.Sprintf("bogusnode%d", i)) c, err = state.CoordinateGetRaw(fmt.Sprintf("bogusnode%d", i))
@ -269,7 +269,7 @@ func TestCoordinate_ListNodes(t *testing.T) {
if err := msgpackrpc.CallWithCodec(codec, "Coordinate.Update", &arg3, &out); err != nil { if err := msgpackrpc.CallWithCodec(codec, "Coordinate.Update", &arg3, &out); err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
time.Sleep(2 * s1.config.CoordinateUpdatePeriod) time.Sleep(3 * s1.config.CoordinateUpdatePeriod)
// Now query back for all the nodes. // Now query back for all the nodes.
arg := structs.DCSpecificRequest{ arg := structs.DCSpecificRequest{

2
consul/prepared_query_endpoint_test.go
View File

@ -1537,7 +1537,7 @@ func TestPreparedQuery_Execute(t *testing.T) {
if err := msgpackrpc.CallWithCodec(codec1, "Coordinate.Update", &req, &out); err != nil { if err := msgpackrpc.CallWithCodec(codec1, "Coordinate.Update", &req, &out); err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
time.Sleep(2 * s1.config.CoordinateUpdatePeriod) time.Sleep(3 * s1.config.CoordinateUpdatePeriod)
} }
// Try an RTT sort. We don't have any other coordinates in there but // Try an RTT sort. We don't have any other coordinates in there but