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

Fix the TestLeader_SecondaryCA_IntermediateRefresh test flakiness

This commit is contained in:
Matt Keeler 2019-12-04 19:19:55 -05:00
parent 08aa4364a3
commit f30af37d11
No known key found for this signature in database
GPG Key ID: 04DBAE1857E0081B
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/consul/leader_connect_test.go
View File

@ -237,6 +237,9 @@ func TestLeader_SecondaryCA_IntermediateRefresh(t *testing.T) {
updatedRoot = activeRoot updatedRoot = activeRoot
} }
testrpc.WaitForActiveCARoot(t, s1.RPC, "dc1", updatedRoot)
testrpc.WaitForActiveCARoot(t, s2.RPC, "dc2", updatedRoot)
// Wait for dc2's intermediate to be refreshed. // Wait for dc2's intermediate to be refreshed.
var intermediatePEM string var intermediatePEM string
retry.Run(t, func(r *retry.R) { retry.Run(t, func(r *retry.R) {
@ -248,9 +251,6 @@ func TestLeader_SecondaryCA_IntermediateRefresh(t *testing.T) {
}) })
require.NoError(err) require.NoError(err)
testrpc.WaitForActiveCARoot(t, s1.RPC, "dc1", updatedRoot)
testrpc.WaitForActiveCARoot(t, s2.RPC, "dc2", updatedRoot)
// Verify the root lists have been rotated in each DC's state store. // Verify the root lists have been rotated in each DC's state store.
state1 := s1.fsm.State() state1 := s1.fsm.State()
_, primaryRoot, err := state1.CARootActive(nil) _, primaryRoot, err := state1.CARootActive(nil)