github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix race condition in `TestCatalogListNodes`

pull/136/head
William Tisäter 2014-05-09 03:00:56 +02:00
parent 76d9fa255b
commit 048b780d61
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
consul/catalog_endpoint_test.go
View File

@ -212,13 +212,12 @@ func TestCatalogListNodes(t *testing.T) {
// Just add a node
s1.fsm.State().EnsureNode(1, structs.Node{"foo", "127.0.0.1"})
if err := client.Call("Catalog.ListNodes", &args, &out); err != nil {
testutil.WaitForResult(func() (bool, error) {
client.Call("Catalog.ListNodes", &args, &out)
return len(out.Nodes) == 2, nil
}, func(err error) {
t.Fatalf("err: %v", err)
}
if len(out.Nodes) != 2 {
t.Fatalf("bad: %v", out)
}
})
// Server node is auto added from Serf
if out.Nodes[0].Node != s1.config.NodeName {