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

test: Make testserver start timeout configurable.

This commit is contained in:
Cyril Gaudin 2017-05-09 15:12:34 +02:00 committed by Frank Schröder
parent 785ff2796f
commit 417ffb8893
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
testutil/server.go
View File

@ -84,6 +84,7 @@ type TestServerConfig struct {
VerifyIncomingRPC bool `json:"verify_incoming_rpc,omitempty"` VerifyIncomingRPC bool `json:"verify_incoming_rpc,omitempty"`
VerifyIncomingHTTPS bool `json:"verify_incoming_https,omitempty"` VerifyIncomingHTTPS bool `json:"verify_incoming_https,omitempty"`
VerifyOutgoing bool `json:"verify_outgoing,omitempty"` VerifyOutgoing bool `json:"verify_outgoing,omitempty"`
ReadyTimeout time.Duration `json:"-"`
Stdout, Stderr io.Writer `json:"-"` Stdout, Stderr io.Writer `json:"-"`
Args []string `json:"-"` Args []string `json:"-"`
} }
@ -121,6 +122,7 @@ func defaultServerConfig() *TestServerConfig {
Server: randomPort(), Server: randomPort(),
RPC: randomPort(), RPC: randomPort(),
}, },
ReadyTimeout: 3 * time.Second,
} }
} }
@ -333,7 +335,10 @@ func (s *TestServer) waitForAPI() error {
// It then waits to ensure the anti-entropy sync has completed. // It then waits to ensure the anti-entropy sync has completed.
func (s *TestServer) waitForLeader() error { func (s *TestServer) waitForLeader() error {
f := &failer{} f := &failer{}
timer := &retry.Timer{Timeout: 3 * time.Second, Wait: 250 * time.Millisecond} timer := &retry.Timer{
Timeout: s.Config.ReadyTimeout,
Wait: 250 * time.Millisecond,
}
var index int64 var index int64
retry.RunWith(timer, f, func(r *retry.R) { retry.RunWith(timer, f, func(r *retry.R) {
// Query the API and check the status code. // Query the API and check the status code.