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

Wait wrap tests in `TestServer_JoinLAN`

pull/136/head
William Tisäter 2014-05-09 03:41:47 +02:00
parent 0e865daf4c
commit 335cd5a68a
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
consul/server_test.go
View File

@ -136,13 +136,17 @@ func TestServer_JoinLAN(t *testing.T) {
}
// Check the members
if len(s1.LANMembers()) != 2 {
testutil.WaitForResult(func() (bool, error) {
return len(s1.LANMembers()) == 2, nil
}, func(err error) {
t.Fatalf("bad len")
}
})
if len(s2.LANMembers()) != 2 {
testutil.WaitForResult(func() (bool, error) {
return len(s2.LANMembers()) == 2, nil
}, func(err error) {
t.Fatalf("bad len")
}
})
}
func TestServer_JoinWAN(t *testing.T) {
@ -162,13 +166,17 @@ func TestServer_JoinWAN(t *testing.T) {
}
// Check the members
if len(s1.WANMembers()) != 2 {
testutil.WaitForResult(func() (bool, error) {
return len(s1.WANMembers()) == 2, nil
}, func(err error) {
t.Fatalf("bad len")
}
})
if len(s2.WANMembers()) != 2 {
testutil.WaitForResult(func() (bool, error) {
return len(s2.WANMembers()) == 2, nil
}, func(err error) {
t.Fatalf("bad len")
}
})
// Check the remoteConsuls has both
if len(s1.remoteConsuls) != 2 {
@ -271,13 +279,17 @@ func TestServer_JoinLAN_TLS(t *testing.T) {
}
// Check the members
if len(s1.LANMembers()) != 2 {
testutil.WaitForResult(func() (bool, error) {
return len(s1.LANMembers()) == 2, nil
}, func(err error) {
t.Fatalf("bad len")
}
})
if len(s2.LANMembers()) != 2 {
testutil.WaitForResult(func() (bool, error) {
return len(s2.LANMembers()) == 2, nil
}, func(err error) {
t.Fatalf("bad len")
}
})
// Verify Raft has established a peer
testutil.WaitForResult(func() (bool, error) {