mirrors/pinniped
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/pinniped.git synced 2026-01-03 11:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into upstream_access_revocation_during_gc

Browse Source
This commit is contained in:
Ryan Richard
2022-01-14 10:49:22 -08:00
parent 92bd3b49c8 50e4871d65
commit 814399324f
88 changed files with 5180 additions and 1586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/registry/credentialrequest/rest_test.go
View File

@@ -1,4 +1,4 @@
// Copyright 2020-2021 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2022 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package credentialrequest
@@ -10,6 +10,7 @@ import (
"testing"
"time"
"github.com/go-logr/logr"
"github.com/golang/mock/gomock"
"github.com/sclevine/spec"
"github.com/stretchr/testify/require"
@@ -71,11 +72,11 @@ func TestCreate(t *testing.T) {
r = require.New(t)
ctrl = gomock.NewController(t)
logger = testutil.NewTranscriptLogger(t)
klog.SetLogger(logger) // this is unfortunately a global logger, so can't run these tests in parallel :(
klog.SetLogger(logr.New(logger)) // this is unfortunately a global logger, so can't run these tests in parallel :(
})
it.After(func() {
klog.SetLogger(nil)
klog.ClearLogger()
ctrl.Finish()
})