Merge branch 'main' into initial_ldap_group_support

This commit is contained in:
Ryan Richard 2021-05-17 14:24:56 -07:00
commit 742b70d6a4

View File

@ -14,6 +14,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authentication/user"
@ -510,7 +511,10 @@ func TestSimultaneousRequestsOnSingleProvider(t *testing.T) {
resultCh := make(chan authUserResult, iterations) resultCh := make(chan authUserResult, iterations)
for i := 0; i < iterations; i++ { for i := 0; i < iterations; i++ {
go func() { go func() {
authResponse, authenticated, err := provider.AuthenticateUser(ctx, authUserCtx, authUserCtxCancelFunc := context.WithTimeout(context.Background(), 2*time.Minute)
defer authUserCtxCancelFunc()
authResponse, authenticated, err := provider.AuthenticateUser(authUserCtx,
env.SupervisorUpstreamLDAP.TestUserCN, env.SupervisorUpstreamLDAP.TestUserPassword, env.SupervisorUpstreamLDAP.TestUserCN, env.SupervisorUpstreamLDAP.TestUserPassword,
) )
resultCh <- authUserResult{ resultCh <- authUserResult{
@ -522,9 +526,10 @@ func TestSimultaneousRequestsOnSingleProvider(t *testing.T) {
} }
for i := 0; i < iterations; i++ { for i := 0; i < iterations; i++ {
result := <-resultCh result := <-resultCh
require.NoError(t, result.err) // Record failures but allow the test to keep running so that all the background goroutines have a chance to try.
require.True(t, result.authenticated, "expected the user to be authenticated, but they were not") assert.NoError(t, result.err)
require.Equal(t, &authenticator.Response{ assert.True(t, result.authenticated, "expected the user to be authenticated, but they were not")
assert.Equal(t, &authenticator.Response{
User: &user.DefaultInfo{Name: "pinny", UID: "1000", Groups: []string{"ball-game-players", "seals"}}, User: &user.DefaultInfo{Name: "pinny", UID: "1000", Groups: []string{"ball-game-players", "seals"}},
}, result.response) }, result.response)
} }