github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98944 from dims/prevent-race-condition-with-bytes-buffer-in-vsphere-unit-tests

Browse Source 
Prevent race condition with bytes buffer in vsphere unit tests
This commit is contained in:
Kubernetes Prow Robot 2021-02-10 16:56:32 -08:00 committed by GitHub
commit a3a3d4ae14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_test.go
View File

@ -32,6 +32,7 @@ import (
"sort"
"strconv"
"strings"
"sync"
"testing"
"github.com/vmware/govmomi/find"
@ -1166,6 +1167,23 @@ func fakeSecret(name, namespace, datacenter, user, password string) *v1.Secret {
}
}
type buffer struct {
b bytes.Buffer
rw sync.RWMutex
}
func (b *buffer) String() string {
b.rw.RLock()
defer b.rw.RUnlock()
return b.b.String()
}
func (b *buffer) Write(p []byte) (n int, err error) {
b.rw.Lock()
defer b.rw.Unlock()
return b.b.Write(p)
}
func TestSecretUpdated(t *testing.T) {
datacenter := "0.0.0.0"
secretName := "vccreds"
@ -1231,8 +1249,8 @@ func TestSecretUpdated(t *testing.T) {
for _, testcase := range testcases {
t.Run(testcase.name, func(t *testing.T) {
buf := new(bytes.Buffer)
errBuf := new(bytes.Buffer)
buf := new(buffer)
errBuf := new(buffer)
klog.SetOutputBySeverity("INFO", buf)
klog.SetOutputBySeverity("WARNING", errBuf)