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

Merge pull request #4940 from hashicorp/ent-test-diff 

Update non-voting server test to fix enterprise diff
This commit is contained in:
Kyle Havlovitz 2018-11-09 20:26:45 -08:00 committed by GitHub
parent 9da67861e2 038aefa0bc
commit 16f843bdf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
agent/consul/server_test.go
View File

@ -590,22 +590,26 @@ func TestServer_Expect(t *testing.T) {
func TestServer_Expect_NonVoters(t *testing.T) {
t.Parallel()
dir1, s1 := testServerDCExpectNonVoter(t, "dc1", 2)
dir1, s1 := testServerDCExpectNonVoter(t, "dc1", 3)
defer os.RemoveAll(dir1)
defer s1.Shutdown()
dir2, s2 := testServerDCExpectNonVoter(t, "dc1", 2)
dir2, s2 := testServerDCExpectNonVoter(t, "dc1", 3)
defer os.RemoveAll(dir2)
defer s2.Shutdown()
dir3, s3 := testServerDCExpect(t, "dc1", 2)
dir3, s3 := testServerDCExpect(t, "dc1", 3)
defer os.RemoveAll(dir3)
defer s3.Shutdown()
dir4, s4 := testServerDCExpect(t, "dc1", 2)
dir4, s4 := testServerDCExpect(t, "dc1", 3)
defer os.RemoveAll(dir4)
defer s4.Shutdown()
dir5, s5 := testServerDCExpect(t, "dc1", 3)
defer os.RemoveAll(dir5)
defer s5.Shutdown()
// Join the first three servers.
joinLAN(t, s2, s1)
joinLAN(t, s3, s1)
@ -619,19 +623,20 @@ func TestServer_Expect_NonVoters(t *testing.T) {
// Join the fourth node.
joinLAN(t, s4, s1)
joinLAN(t, s5, s1)
// Now we have three servers so we should bootstrap.
retry.Run(t, func(r *retry.R) {
r.Check(wantPeers(s1, 2))
r.Check(wantPeers(s2, 2))
r.Check(wantPeers(s3, 2))
r.Check(wantPeers(s4, 2))
r.Check(wantPeers(s1, 3))
r.Check(wantPeers(s2, 3))
r.Check(wantPeers(s3, 3))
r.Check(wantPeers(s4, 3))
})
// Make sure a leader is elected
testrpc.WaitForLeader(t, s1.RPC, "dc1")
retry.Run(t, func(r *retry.R) {
r.Check(wantRaft([]*Server{s1, s2, s3, s4}))
r.Check(wantRaft([]*Server{s1, s2, s3, s4, s5}))
})
}