status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-18 00:27:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix attempt for test fail panics in xDS (#16319)

Browse Source 
* Fix attempt for test fail panics in xDS

* switch to a mutex pointer
This commit is contained in:
Andrew Stucki 2023-02-24 17:00:31 -05:00 committed by GitHub
parent d99dcd48c2
commit 801a17329e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
agent/xds/delta_test.go
View File

@ -4,6 +4,7 @@ import (
"errors" "errors"
"strconv" "strconv"
"strings" "strings"
"sync"
"sync/atomic" "sync/atomic"
"testing" "testing"
"time" "time"
@ -1058,6 +1059,15 @@ func TestServer_DeltaAggregatedResources_v3_ACLEnforcement(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
var stopped bool
lock := &sync.RWMutex{}
defer func() {
lock.Lock()
stopped = true
lock.Unlock()
}()
// aclResolve may be called in a goroutine even after a // aclResolve may be called in a goroutine even after a
// testcase tt returns. Capture the variable as tc so the // testcase tt returns. Capture the variable as tc so the
// values don't swap in the next iteration. // values don't swap in the next iteration.
@ -1071,6 +1081,14 @@ func TestServer_DeltaAggregatedResources_v3_ACLEnforcement(t *testing.T) {
// No token and defaultDeny is denied // No token and defaultDeny is denied
return acl.RootAuthorizer("deny"), nil return acl.RootAuthorizer("deny"), nil
} }
lock.RLock()
defer lock.RUnlock()
if stopped {
return acl.DenyAll().ToAllowAuthorizer(), nil
}
// Ensure the correct token was passed // Ensure the correct token was passed
require.Equal(t, tc.token, id) require.Equal(t, tc.token, id)
// Parse the ACL and enforce it // Parse the ACL and enforce it