From dc6795a55adb55265330b7927994b1b51c763de2 Mon Sep 17 00:00:00 2001 From: Armon Dadgar Date: Tue, 12 May 2015 12:10:25 -0700 Subject: [PATCH] api: improve test reliability --- api/event_test.go | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/api/event_test.go b/api/event_test.go index b37c24924c66..1ca92e23318c 100644 --- a/api/event_test.go +++ b/api/event_test.go @@ -2,6 +2,8 @@ package api import ( "testing" + + "github.com/hashicorp/consul/testutil" ) func TestEvent_FireList(t *testing.T) { @@ -25,16 +27,23 @@ func TestEvent_FireList(t *testing.T) { t.Fatalf("invalid: %v", id) } - events, qm, err := event.List("", nil) - if err != nil { - t.Fatalf("err: %v", err) + var events []*UserEvent + var qm *QueryMeta + testutil.WaitForResult(func() (bool, error) { + events, qm, err = event.List("", nil) + if err != nil { + t.Fatalf("err: %v", err) + } + return len(events) > 0, err + }, func(err error) { + t.Fatalf("err: %#v", err) + }) + + if events[len(events)-1].ID != id { + t.Fatalf("bad: %#v", events) } if qm.LastIndex != event.IDToIndex(id) { t.Fatalf("Bad: %#v", qm) } - - if events[len(events)-1].ID != id { - t.Fatalf("bad: %#v", events) - } }