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

Merge pull request #85011 from zxl381/GL_4_Fatal_2

Browse Source 
apimachinery: fix bugs in a Test function
This commit is contained in:
Kubernetes Prow Robot 2020-01-30 16:58:19 -08:00 committed by GitHub
commit f488d78536
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/connection_test.go
View File

@ -27,10 +27,11 @@ import (
"k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/httpstream"
) )
func runProxy(t *testing.T, backendUrl string, proxyUrl chan<- string, proxyDone chan<- struct{}) { func runProxy(t *testing.T, backendUrl string, proxyUrl chan<- string, proxyDone chan<- struct{}, errCh chan<- error) {
listener, err := net.Listen("tcp4", "localhost:0") listener, err := net.Listen("tcp4", "localhost:0")
if err != nil { if err != nil {
t.Fatalf("error listening: %v", err) errCh <- err
return
} }
defer listener.Close() defer listener.Close()
@ -67,10 +68,11 @@ func runProxy(t *testing.T, backendUrl string, proxyUrl chan<- string, proxyDone
proxyDone <- struct{}{} proxyDone <- struct{}{}
} }
func runServer(t *testing.T, backendUrl chan<- string, serverDone chan<- struct{}) { func runServer(t *testing.T, backendUrl chan<- string, serverDone chan<- struct{}, errCh chan<- error) {
listener, err := net.Listen("tcp4", "localhost:0") listener, err := net.Listen("tcp4", "localhost:0")
if err != nil { if err != nil {
t.Fatalf("server: error listening: %v", err) errCh <- err
return
} }
defer listener.Close() defer listener.Close()
@ -115,15 +117,29 @@ func runServer(t *testing.T, backendUrl chan<- string, serverDone chan<- struct{
} }
func TestConnectionCloseIsImmediateThroughAProxy(t *testing.T) { func TestConnectionCloseIsImmediateThroughAProxy(t *testing.T) {
serverDone := make(chan struct{}) errCh := make(chan error)
backendUrlChan := make(chan string)
go runServer(t, backendUrlChan, serverDone)
backendUrl := <-backendUrlChan
proxyDone := make(chan struct{}) serverDone := make(chan struct{}, 1)
backendUrlChan := make(chan string)
go runServer(t, backendUrlChan, serverDone, errCh)
var backendUrl string
select {
case err := <-errCh:
t.Fatalf("server: error listening: %v", err)
case backendUrl = <-backendUrlChan:
}
proxyDone := make(chan struct{}, 1)
proxyUrlChan := make(chan string) proxyUrlChan := make(chan string)
go runProxy(t, backendUrl, proxyUrlChan, proxyDone) go runProxy(t, backendUrl, proxyUrlChan, proxyDone, errCh)
proxyUrl := <-proxyUrlChan
var proxyUrl string
select {
case err := <-errCh:
t.Fatalf("error listening: %v", err)
case proxyUrl = <-proxyUrlChan:
}
conn, err := net.Dial("tcp4", proxyUrl) conn, err := net.Dial("tcp4", proxyUrl)
if err != nil { if err != nil {