mirror of
https://github.com/golang/go
synced 2024-11-23 18:10:04 -07:00
net/http: eliminate arbitrary timeout in TestClientWriteShutdown
This test occasionally hangs on the darwin-arm64-11_0-toothrot builder. When it does, it fails with the unhelpful error message "timeout" instead of a useful goroutine dump. This change eliminates the use of an arbitrary timeout channel, so that if (and probably when) the test hangs again we will get more useful logs to diagnose the root cause. For #49860 Change-Id: I23f6f1c81209f0b2dbe565e1dfb26b1b2eff0187 Reviewed-on: https://go-review.googlesource.com/c/go/+/367615 Trust: Bryan C. Mills <bcmills@google.com> Run-TryBot: Bryan C. Mills <bcmills@google.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Damien Neil <dneil@google.com>
This commit is contained in:
parent
f463b20789
commit
18934e11ba
@ -3075,22 +3075,14 @@ func TestClientWriteShutdown(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatalf("CloseWrite: %v", err)
|
||||
}
|
||||
donec := make(chan bool)
|
||||
go func() {
|
||||
defer close(donec)
|
||||
bs, err := io.ReadAll(conn)
|
||||
if err != nil {
|
||||
t.Errorf("ReadAll: %v", err)
|
||||
}
|
||||
got := string(bs)
|
||||
if got != "" {
|
||||
t.Errorf("read %q from server; want nothing", got)
|
||||
}
|
||||
}()
|
||||
select {
|
||||
case <-donec:
|
||||
case <-time.After(10 * time.Second):
|
||||
t.Fatalf("timeout")
|
||||
|
||||
bs, err := io.ReadAll(conn)
|
||||
if err != nil {
|
||||
t.Errorf("ReadAll: %v", err)
|
||||
}
|
||||
got := string(bs)
|
||||
if got != "" {
|
||||
t.Errorf("read %q from server; want nothing", got)
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user