mirror of https://github.com/status-im/consul.git
acl: fix test failures caused by remocving legacy ACLs
This commit two test failures: 1. Remove check for "in legacy ACL mode", the actual upgrade will be removed in a following commit. 2. Remove the early WaitForLeader in dc2, because with it the test was failing with ACL not found.
This commit is contained in:
parent
8e9773e20b
commit
a1e3fa818c
|
@ -170,11 +170,6 @@ func (a *ACL) aclPreCheck() error {
|
|||
if !a.srv.config.ACLsEnabled {
|
||||
return acl.ErrDisabled
|
||||
}
|
||||
|
||||
if a.srv.UseLegacyACLs() {
|
||||
return fmt.Errorf("The ACL system is currently in legacy mode.")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
@ -376,7 +376,6 @@ func TestLeader_FederationStateAntiEntropyPruning_ACLDeny(t *testing.T) {
|
|||
c.ACLMasterToken = "root"
|
||||
c.ACLResolverSettings.ACLDefaultPolicy = "deny"
|
||||
})
|
||||
testrpc.WaitForLeader(t, s2.RPC, "dc2")
|
||||
defer os.RemoveAll(dir2)
|
||||
defer s2.Shutdown()
|
||||
|
||||
|
|
Loading…
Reference in New Issue