Skip to content

K
k3s
Commit 3bae345a authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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/
parents ae1ff1a2 345f875c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy_test.go
View file @ 3bae345a
...@@ -25,6 +25,7 @@ import ( ...@@ -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) { ...@@ -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(&timesCalled, 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) { ...@@ -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(&timesCalled) > 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)
} }
}() }()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment