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 #107841 from aojea/fix_race_socks5

Browse Source 
deflake TestRoundTripSocks5AndNewConnection unit test
This commit is contained in:
Kubernetes Prow Robot 2022-01-29 02:48:01 -08:00 committed by GitHub
commit 2e68fd2857
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper_test.go
View File

@ -438,7 +438,6 @@ func (i *Interceptor) Rewrite(ctx context.Context, req *socks5.Request) (context
// be sure to unset environment variable https_proxy (if exported) before testing, otherwise the testing will fail unexpectedly. // be sure to unset environment variable https_proxy (if exported) before testing, otherwise the testing will fail unexpectedly.
func TestRoundTripSocks5AndNewConnection(t *testing.T) { func TestRoundTripSocks5AndNewConnection(t *testing.T) {
t.Skip("Flake https://issues.k8s.io/107708")
localhostPool := localhostCertPool(t) localhostPool := localhostCertPool(t)
for _, redirect := range []bool{false, true} { for _, redirect := range []bool{false, true} {
@ -568,10 +567,7 @@ func TestRoundTripSocks5AndNewConnection(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("socks5Server: proxy_test: Listen: %v", err) t.Fatalf("socks5Server: proxy_test: Listen: %v", err)
} }
defer func() { defer l.Close()
close(closed)
l.Close()
}()
go func(shoulderror bool) { go func(shoulderror bool) {
conn, err := l.Accept() conn, err := l.Accept()
@ -584,6 +580,10 @@ func TestRoundTripSocks5AndNewConnection(t *testing.T) {
} }
if err := proxyHandler.ServeConn(conn); err != nil && !shoulderror { if err := proxyHandler.ServeConn(conn); err != nil && !shoulderror {
// If the connection request is closed before the channel is closed
// the test will fail with a ServeConn error. Since the test only return
// early if expects shouldError=true, the channel is closed at the end of
// the test, just before all the deferred connections Close() are executed.
if isClosed() { if isClosed() {
return return
} }
@ -684,6 +684,9 @@ func TestRoundTripSocks5AndNewConnection(t *testing.T) {
t.Fatalf("unexpected proxy user: %v", authUser) t.Fatalf("unexpected proxy user: %v", authUser)
} }
} }
// The channel must be closed before any of the connections are closed
close(closed)
}) })
} }
}) })