From 038aefa0bcccbd025b77e827d561a83a491c2bf8 Mon Sep 17 00:00:00 2001 From: Kyle Havlovitz Date: Fri, 9 Nov 2018 12:50:24 -0800 Subject: [PATCH] update non-voting server test to fix enterprise diff --- agent/consul/server_test.go | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/agent/consul/server_test.go b/agent/consul/server_test.go index d999b3d6e..795dd97e2 100644 --- a/agent/consul/server_test.go +++ b/agent/consul/server_test.go @@ -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})) }) }