mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 06:27:05 +00:00
fix race in proxy unit test
This commit is contained in:
parent
ae1ff1a2d4
commit
345f875c51
@ -25,6 +25,7 @@ import (
|
|||||||
"net/url"
|
"net/url"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync/atomic"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"golang.org/x/net/websocket"
|
"golang.org/x/net/websocket"
|
||||||
@ -301,16 +302,16 @@ func TestProxyUpgrade(t *testing.T) {
|
|||||||
for k, tc := range testcases {
|
for k, tc := range testcases {
|
||||||
tcName := k
|
tcName := k
|
||||||
path := "/apis/" + tc.APIService.Spec.Group + "/" + tc.APIService.Spec.Version + "/foo"
|
path := "/apis/" + tc.APIService.Spec.Group + "/" + tc.APIService.Spec.Version + "/foo"
|
||||||
called := false
|
timesCalled := int32(0)
|
||||||
|
|
||||||
func() { // Cleanup after each test case.
|
func() { // Cleanup after each test case.
|
||||||
backendHandler := http.NewServeMux()
|
backendHandler := http.NewServeMux()
|
||||||
backendHandler.Handle(path, websocket.Handler(func(ws *websocket.Conn) {
|
backendHandler.Handle(path, websocket.Handler(func(ws *websocket.Conn) {
|
||||||
|
atomic.AddInt32(×Called, 1)
|
||||||
defer ws.Close()
|
defer ws.Close()
|
||||||
body := make([]byte, 5)
|
body := make([]byte, 5)
|
||||||
ws.Read(body)
|
ws.Read(body)
|
||||||
ws.Write([]byte("hello " + string(body)))
|
ws.Write([]byte("hello " + string(body)))
|
||||||
called = true
|
|
||||||
}))
|
}))
|
||||||
|
|
||||||
backendServer := httptest.NewUnstartedServer(backendHandler)
|
backendServer := httptest.NewUnstartedServer(backendHandler)
|
||||||
@ -324,7 +325,7 @@ func TestProxyUpgrade(t *testing.T) {
|
|||||||
defer backendServer.Close()
|
defer backendServer.Close()
|
||||||
|
|
||||||
defer func() {
|
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)
|
t.Errorf("%s: expected called=%v, got %v", tcName, tc.ExpectCalled, called)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
Loading…
Reference in New Issue
Block a user