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

rpc: fix logging and try quicker timing of TestServer_JoinSeparateLanAndWanAddresses

This commit is contained in:
Frank Schroeder 2017-06-28 00:04:17 +02:00 committed by Frank Schröder
parent 98510f898c
commit 2eb2941e8c
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
agent/consul/server_test.go
View File

@ -277,23 +277,36 @@ func TestServer_JoinWAN_Flood(t *testing.T) {
func TestServer_JoinSeparateLanAndWanAddresses(t *testing.T) { func TestServer_JoinSeparateLanAndWanAddresses(t *testing.T) {
t.Parallel() t.Parallel()
dir1, s1 := testServer(t) dir1, s1 := testServerWithConfig(t, func(c *Config) {
c.NodeName = t.Name() + "-s1"
c.Datacenter = "dc1"
c.Bootstrap = true
c.SerfFloodInterval = 100 * time.Millisecond
})
defer os.RemoveAll(dir1) defer os.RemoveAll(dir1)
defer s1.Shutdown() defer s1.Shutdown()
s2Name := t.Name() + "-s2"
dir2, s2 := testServerWithConfig(t, func(c *Config) { dir2, s2 := testServerWithConfig(t, func(c *Config) {
c.NodeName = "s2" c.NodeName = s2Name
c.Datacenter = "dc2" c.Datacenter = "dc2"
c.Bootstrap = false
// This wan address will be expected to be seen on s1 // This wan address will be expected to be seen on s1
c.SerfWANConfig.MemberlistConfig.AdvertiseAddr = "127.0.0.2" c.SerfWANConfig.MemberlistConfig.AdvertiseAddr = "127.0.0.2"
// This lan address will be expected to be seen on s3 // This lan address will be expected to be seen on s3
c.SerfLANConfig.MemberlistConfig.AdvertiseAddr = "127.0.0.3" c.SerfLANConfig.MemberlistConfig.AdvertiseAddr = "127.0.0.3"
c.SerfFloodInterval = 100 * time.Millisecond
}) })
defer os.RemoveAll(dir2) defer os.RemoveAll(dir2)
defer s2.Shutdown() defer s2.Shutdown()
dir3, s3 := testServerDC(t, "dc2") dir3, s3 := testServerWithConfig(t, func(c *Config) {
c.NodeName = t.Name() + "-s3"
c.Datacenter = "dc2"
c.Bootstrap = true
c.SerfFloodInterval = 100 * time.Millisecond
})
defer os.RemoveAll(dir3) defer os.RemoveAll(dir3)
defer s3.Shutdown() defer s3.Shutdown()
@ -333,7 +346,7 @@ func TestServer_JoinSeparateLanAndWanAddresses(t *testing.T) {
// Get and check the wan address of s2 from s1 // Get and check the wan address of s2 from s1
var s2WanAddr string var s2WanAddr string
for _, member := range s1.WANMembers() { for _, member := range s1.WANMembers() {
if member.Name == "s2.dc2" { if member.Name == s2Name+".dc2" {
s2WanAddr = member.Addr.String() s2WanAddr = member.Addr.String()
} }
} }
@ -344,7 +357,7 @@ func TestServer_JoinSeparateLanAndWanAddresses(t *testing.T) {
// Get and check the lan address of s2 from s3 // Get and check the lan address of s2 from s3
var s2LanAddr string var s2LanAddr string
for _, lanmember := range s3.LANMembers() { for _, lanmember := range s3.LANMembers() {
if lanmember.Name == "s2" { if lanmember.Name == s2Name {
s2LanAddr = lanmember.Addr.String() s2LanAddr = lanmember.Addr.String()
} }
} }