status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-18 08:36:46 +00:00
Code Issues Projects Releases Wiki Activity

agent: make event buffer test non-sequential

Browse Source
This commit is contained in:
Ryan Uber 2014-11-20 20:48:51 -08:00
parent da96fb5499
commit dbd420fc4b
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
command/agent/event_endpoint_test.go
View File

@ -130,14 +130,14 @@ func TestEventList_Filter(t *testing.T) {
func TestEventList_Blocking(t *testing.T) { func TestEventList_Blocking(t *testing.T) {
httpTest(t, func(srv *HTTPServer) { httpTest(t, func(srv *HTTPServer) {
p := &UserEvent{Name: "foo"} p := &UserEvent{Name: "test"}
if err := srv.agent.UserEvent("", p); err != nil { if err := srv.agent.UserEvent("", p); err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
var index string var index string
testutil.WaitForResult(func() (bool, error) { testutil.WaitForResult(func() (bool, error) {
req, err := http.NewRequest("GET", "/v1/event/list?name=foo", nil) req, err := http.NewRequest("GET", "/v1/event/list", nil)
if err != nil { if err != nil {
return false, err return false, err
} }
@ -158,14 +158,14 @@ func TestEventList_Blocking(t *testing.T) {
go func() { go func() {
time.Sleep(50 * time.Millisecond) time.Sleep(50 * time.Millisecond)
p := &UserEvent{Name: "bar"} p := &UserEvent{Name: "second"}
if err := srv.agent.UserEvent("", p); err != nil { if err := srv.agent.UserEvent("", p); err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
}() }()
testutil.WaitForResult(func() (bool, error) { testutil.WaitForResult(func() (bool, error) {
url := "/v1/event/list?name=bar&index=" + index url := "/v1/event/list?index=" + index
req, err := http.NewRequest("GET", url, nil) req, err := http.NewRequest("GET", url, nil)
if err != nil { if err != nil {
return false, err return false, err
@ -175,32 +175,42 @@ func TestEventList_Blocking(t *testing.T) {
if err != nil { if err != nil {
return false, err return false, err
} }
header := resp.Header().Get("X-Consul-Index")
if header == "" || header == "0" {
return false, fmt.Errorf("bad: %#v", header)
}
list, ok := obj.([]*UserEvent) list, ok := obj.([]*UserEvent)
if !ok { if !ok {
return false, fmt.Errorf("bad: %#v", obj) return false, fmt.Errorf("bad: %#v", obj)
} }
if len(list) != 1 || list[0].Name != "bar" { if len(list) != 2 || list[1].Name != "second" {
return false, fmt.Errorf("bad: %#v", list) return false, fmt.Errorf("bad: %#v", list)
} }
index = header
return true, nil return true, nil
}, func(err error) { }, func(err error) {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
}) })
})
}
// Test again to make sure that the event order is preserved func TestEventList_EventBufOrder(t *testing.T) {
// when name filtering on a list of > 1 matching event. httpTest(t, func(srv *HTTPServer) {
p = &UserEvent{Name: "bar"} // Fire some events in a non-sequential order
if err := srv.agent.UserEvent("", p); err != nil { expected := &UserEvent{Name: "foo"}
for _, e := range []*UserEvent{
&UserEvent{Name: "foo"},
&UserEvent{Name: "bar"},
&UserEvent{Name: "foo"},
expected,
&UserEvent{Name: "bar"},
} {
if err := srv.agent.UserEvent("", e); err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
}
// Test that the event order is preserved when name
// filtering on a list of > 1 matching event.
testutil.WaitForResult(func() (bool, error) { testutil.WaitForResult(func() (bool, error) {
url := "/v1/event/list?name=bar&index=" + index url := "/v1/event/list?name=foo"
req, err := http.NewRequest("GET", url, nil) req, err := http.NewRequest("GET", url, nil)
if err != nil { if err != nil {
return false, err return false, err
@ -210,18 +220,13 @@ func TestEventList_Blocking(t *testing.T) {
if err != nil { if err != nil {
return false, err return false, err
} }
header := resp.Header().Get("X-Consul-Index")
if header == "" || header == "0" {
return false, fmt.Errorf("bad: %#v", header)
}
list, ok := obj.([]*UserEvent) list, ok := obj.([]*UserEvent)
if !ok { if !ok {
return false, fmt.Errorf("bad: %#v", obj) return false, fmt.Errorf("bad: %#v", obj)
} }
if len(list) != 2 || list[1].Name != "bar" || list[1].ID != p.ID { if len(list) != 3 || list[2].ID != expected.ID {
return false, fmt.Errorf("bad: %#v", list) return false, fmt.Errorf("bad: %#v", list)
} }
index = header
return true, nil return true, nil
}, func(err error) { }, func(err error) {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)