mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #49404 from liggitt/test-race
Automatic merge from submit-queue fix race in proxy unit test fixes #49413, follow up to https://github.com/kubernetes/kubernetes/pull/49353 to fix a race in the unit test: ``` go test -v k8s.io/kubernetes/vendor/k8s.io/kube-aggregator/pkg/apiserver -run TestProxyUpgrade$ handler_proxy_test.go:328: invalid hostname + insecure: expected called=true, got false testing.go:610: race detected during execution of test ``` https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/pr-logs/pull/48746/pull-kubernetes-unit/42230/
This commit is contained in:
commit
3bae345a95
@ -25,6 +25,7 @@ import (
|
||||
"net/url"
|
||||
"reflect"
|
||||
"strings"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
|
||||
"golang.org/x/net/websocket"
|
||||
@ -301,16 +302,16 @@ func TestProxyUpgrade(t *testing.T) {
|
||||
for k, tc := range testcases {
|
||||
tcName := k
|
||||
path := "/apis/" + tc.APIService.Spec.Group + "/" + tc.APIService.Spec.Version + "/foo"
|
||||
called := false
|
||||
timesCalled := int32(0)
|
||||
|
||||
func() { // Cleanup after each test case.
|
||||
backendHandler := http.NewServeMux()
|
||||
backendHandler.Handle(path, websocket.Handler(func(ws *websocket.Conn) {
|
||||
atomic.AddInt32(×Called, 1)
|
||||
defer ws.Close()
|
||||
body := make([]byte, 5)
|
||||
ws.Read(body)
|
||||
ws.Write([]byte("hello " + string(body)))
|
||||
called = true
|
||||
}))
|
||||
|
||||
backendServer := httptest.NewUnstartedServer(backendHandler)
|
||||
@ -324,7 +325,7 @@ func TestProxyUpgrade(t *testing.T) {
|
||||
defer backendServer.Close()
|
||||
|
||||
defer func() {
|
||||
if called != tc.ExpectCalled {
|
||||
if called := atomic.LoadInt32(×Called) > 0; called != tc.ExpectCalled {
|
||||
t.Errorf("%s: expected called=%v, got %v", tcName, tc.ExpectCalled, called)
|
||||
}
|
||||
}()
|
||||
|
Loading…
Reference in New Issue
Block a user