TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

tsweb: fix TestStdHandler_ConnectionClosedDuringBody flake (#13046)

Browse Source 
Fixes #13017

Signed-off-by: Paul Scott <paul@tailscale.com>
This commit is contained in:
Paul Scott 2024-08-12 16:30:32 +01:00 committed by GitHub
parent 2e32abc3e2
commit bc2744da4b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tsweb/tsweb_test.go
View File

@ -22,7 +22,6 @@
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts" "github.com/google/go-cmp/cmp/cmpopts"
"tailscale.com/cmd/testwrapper/flakytest"
"tailscale.com/metrics" "tailscale.com/metrics"
"tailscale.com/tstest" "tailscale.com/tstest"
"tailscale.com/util/httpm" "tailscale.com/util/httpm"
@ -865,14 +864,14 @@ func TestStdHandler_CanceledAfterHeader(t *testing.T) {
} }
func TestStdHandler_ConnectionClosedDuringBody(t *testing.T) { func TestStdHandler_ConnectionClosedDuringBody(t *testing.T) {
flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/13017")
now := time.Now() now := time.Now()
// Start a HTTP server that returns 1MB of data. // Start a HTTP server that writes back zeros until the request is abandoned.
// We next put a reverse-proxy in front of this server. // We next put a reverse-proxy in front of this server.
rs := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { rs := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
for range 1024 { zeroes := make([]byte, 1024)
w.Write(make([]byte, 1024)) for r.Context().Err() == nil {
w.Write(zeroes)
} }
})) }))
defer rs.Close() defer rs.Close()
@ -880,8 +879,9 @@ func TestStdHandler_ConnectionClosedDuringBody(t *testing.T) {
r := make(chan AccessLogRecord) r := make(chan AccessLogRecord)
var e *HTTPError var e *HTTPError
responseStarted := make(chan struct{}) responseStarted := make(chan struct{})
requestCanceled := make(chan struct{})
// Create another server which proxies our 1MB server. // Create another server which proxies our zeroes server.
// The [httputil.ReverseProxy] will panic with [http.ErrAbortHandler] when // The [httputil.ReverseProxy] will panic with [http.ErrAbortHandler] when
// it fails to copy the response to the client. // it fails to copy the response to the client.
h := StdHandler( h := StdHandler(
@ -890,10 +890,6 @@ func TestStdHandler_ConnectionClosedDuringBody(t *testing.T) {
Director: func(r *http.Request) { Director: func(r *http.Request) {
r.URL = must.Get(url.Parse(rs.URL)) r.URL = must.Get(url.Parse(rs.URL))
}, },
ModifyResponse: func(r *http.Response) error {
close(responseStarted)
return nil
},
}).ServeHTTP(w, r) }).ServeHTTP(w, r)
return nil return nil
}), }),
@ -908,7 +904,11 @@ func TestStdHandler_ConnectionClosedDuringBody(t *testing.T) {
}, },
}, },
) )
s := httptest.NewServer(h) s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
close(responseStarted)
<-requestCanceled
h.ServeHTTP(w, r.WithContext(context.WithoutCancel(r.Context())))
}))
t.Cleanup(s.Close) t.Cleanup(s.Close)
// Create a context which gets canceled after the handler starts processing // Create a context which gets canceled after the handler starts processing
@ -925,6 +925,7 @@ func TestStdHandler_ConnectionClosedDuringBody(t *testing.T) {
t.Fatalf("making request: %s", err) t.Fatalf("making request: %s", err)
} }
res, err := http.DefaultClient.Do(req) res, err := http.DefaultClient.Do(req)
close(requestCanceled)
if !errors.Is(err, context.Canceled) { if !errors.Is(err, context.Canceled) {
t.Errorf("got error %v, want context.Canceled", err) t.Errorf("got error %v, want context.Canceled", err)
} }