From b74aaa1427916368c5a1e0ba156f461b2a0f411a Mon Sep 17 00:00:00 2001 From: Damien Neil Date: Thu, 17 Nov 2022 11:09:11 -0800 Subject: [PATCH] net/http: deflake TestResponseControllerSetFutureWriteDeadline Don't set the server's write deadline until after the client has read the response headers, avoiding test failures if the deadline expires before or while writing headers. Fixes #56807. Change-Id: I5f80c108b360d030132a13661774a30fac453856 Reviewed-on: https://go-review.googlesource.com/c/go/+/451715 Auto-Submit: Damien Neil TryBot-Result: Gopher Robot Run-TryBot: Damien Neil Reviewed-by: Bryan Mills --- src/net/http/responsecontroller_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/net/http/responsecontroller_test.go b/src/net/http/responsecontroller_test.go index af036837a4..90c57016a7 100644 --- a/src/net/http/responsecontroller_test.go +++ b/src/net/http/responsecontroller_test.go @@ -132,8 +132,14 @@ func testResponseControllerSetFutureWriteDeadline(t *testing.T, mode testMode) { t.Skip("skip until h2_bundle.go is updated") } errc := make(chan error, 1) + startwritec := make(chan struct{}) cst := newClientServerTest(t, mode, HandlerFunc(func(w ResponseWriter, r *Request) { ctl := NewResponseController(w) + w.WriteHeader(200) + if err := ctl.Flush(); err != nil { + t.Errorf("ctl.Flush() = %v, want nil", err) + } + <-startwritec // don't set the deadline until the client reads response headers if err := ctl.SetWriteDeadline(time.Now().Add(1 * time.Millisecond)); err != nil { t.Errorf("ctl.SetWriteDeadline() = %v, want nil", err) } @@ -142,6 +148,7 @@ func testResponseControllerSetFutureWriteDeadline(t *testing.T, mode testMode) { })) res, err := cst.c.Get(cst.ts.URL) + close(startwritec) if err != nil { t.Fatalf("unexpected connection error: %v", err) } -- 2.48.1