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: deflake TestStdHandler_ConnectionClosedDuringBody

Browse Source 
Updates #131017

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2024-08-03 17:20:53 -07:00
parent 17c88a19be
commit c79c61a9f9
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
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,7 +864,6 @@ 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 returns 1MB of data.
@ -877,9 +875,8 @@ func TestStdHandler_ConnectionClosedDuringBody(t *testing.T) {
})) }))
defer rs.Close() defer rs.Close()
r := make(chan AccessLogRecord) r := make(chan AccessLogRecord, 1)
var e *HTTPError var e *HTTPError
responseStarted := make(chan struct{})
// Create another server which proxies our 1MB server. // Create another server which proxies our 1MB server.
// The [httputil.ReverseProxy] will panic with [http.ErrAbortHandler] when // The [httputil.ReverseProxy] will panic with [http.ErrAbortHandler] when
@ -890,10 +887,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
}), }),
@ -914,10 +907,6 @@ func TestStdHandler_ConnectionClosedDuringBody(t *testing.T) {
// Create a context which gets canceled after the handler starts processing // Create a context which gets canceled after the handler starts processing
// the request. // the request.
ctx, cancelReq := context.WithCancel(context.Background()) ctx, cancelReq := context.WithCancel(context.Background())
go func() {
<-responseStarted
cancelReq()
}()
// Send a request to our server. // Send a request to our server.
req, err := http.NewRequestWithContext(ctx, httpm.GET, s.URL, nil) req, err := http.NewRequestWithContext(ctx, httpm.GET, s.URL, nil)
@ -925,11 +914,18 @@ 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)
if !errors.Is(err, context.Canceled) { if err != nil {
t.Errorf("got error %v, want context.Canceled", err) t.Fatalf("got error %v, want nil", err)
} }
if res != nil { defer res.Body.Close()
t.Errorf("got response %#v, want nil", res) cancelReq()
if b, err := io.ReadAll(res.Body); err == nil {
t.Errorf("read %d bytes", len(b))
} else if !errors.Is(err, context.Canceled) {
t.Errorf("got error %v, want context.Canceled", err)
} else if len(b) == 1<<20 {
t.Errorf("read all 1MB of response, want less")
} }
// Check that we got the expected log record. // Check that we got the expected log record.