luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

api: use WaitForResult() to improve health tests

This commit is contained in:
Ryan Uber 2015-01-06 16:18:50 -08:00
parent 77f041b41f
commit 9beeb6c81b
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/health_test.go
View File

@ -1,8 +1,10 @@
package api package api
import ( import (
"fmt"
"testing" "testing"
"time"
"github.com/hashicorp/consul/testutil"
) )
func TestHealth_Node(t *testing.T) { func TestHealth_Node(t *testing.T) {
@ -50,20 +52,21 @@ func TestHealth_Checks(t *testing.T) {
} }
defer agent.ServiceDeregister("foo") defer agent.ServiceDeregister("foo")
// Wait for the register... testutil.WaitForResult(func() (bool, error) {
time.Sleep(20 * time.Millisecond)
checks, meta, err := health.Checks("foo", nil) checks, meta, err := health.Checks("foo", nil)
if err != nil { if err != nil {
t.Fatalf("err: %v", err) return false, err
} }
if meta.LastIndex == 0 { if meta.LastIndex == 0 {
t.Fatalf("bad: %v", meta) return false, fmt.Errorf("bad: %v", meta)
} }
if len(checks) == 0 { if len(checks) == 0 {
t.Fatalf("Bad: %v", checks) return false, fmt.Errorf("Bad: %v", checks)
} }
return true, nil
}, func(err error) {
t.Fatalf("err: %s", err)
})
} }
func TestHealth_Service(t *testing.T) { func TestHealth_Service(t *testing.T) {