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

Makes WaitForResult always return an error if it times out.

This commit is contained in:
James Phillips 2017-03-23 20:04:39 -07:00
parent 85c03852a4
commit 4e7064023f
No known key found for this signature in database
GPG Key ID: 77183E682AC5FC11
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
testutil/wait.go
View File

@ -6,10 +6,10 @@ import (
"time" "time"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"github.com/pkg/errors"
) )
type testFn func() (bool, error) type testFn func() (bool, error)
type errorFn func(error)
const ( const (
baseWait = 1 * time.Millisecond baseWait = 1 * time.Millisecond
@ -33,8 +33,11 @@ func WaitForResult(try testFn) error {
wait = maxWait wait = maxWait
} }
} }
if err != nil {
return err return errors.Wrap(err, "timed out with error")
} else {
return fmt.Errorf("timed out")
}
} }
type rpcFn func(string, interface{}, interface{}) error type rpcFn func(string, interface{}, interface{}) error