mirror of
https://github.com/golang/net.git
synced 2026-04-01 02:47:08 +09:00
http2: remove the timeout since we don't know a good value
The test is expected to finish so rather than wait on some arbitrary timeout, let the go test timeout show us where things went wrong. Fixes golang/go#42381 Change-Id: Ia9405f9f75b2f5f73ed3f8a540a74b7c64066ad0 Reviewed-on: https://go-review.googlesource.com/c/net/+/267977 Run-TryBot: Bryan C. Mills <bcmills@google.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Bryan C. Mills <bcmills@google.com> Trust: Dmitri Shuralyov <dmitshur@golang.org>
This commit is contained in:
committed by
Bryan C. Mills
parent
a11eb1b685
commit
69a78807bb
@@ -3582,8 +3582,6 @@ func TestTransportRetryAfterGOAWAY(t *testing.T) {
|
||||
}
|
||||
|
||||
errs := make(chan error, 3)
|
||||
done := make(chan struct{})
|
||||
defer close(done)
|
||||
|
||||
// Client.
|
||||
go func() {
|
||||
@@ -3605,12 +3603,7 @@ func TestTransportRetryAfterGOAWAY(t *testing.T) {
|
||||
|
||||
// Server for the first request.
|
||||
go func() {
|
||||
var ct *clientTester
|
||||
select {
|
||||
case ct = <-ct1:
|
||||
case <-done:
|
||||
return
|
||||
}
|
||||
ct := <-ct1
|
||||
|
||||
connToClose <- ct.cc
|
||||
ct.greet()
|
||||
@@ -3629,12 +3622,7 @@ func TestTransportRetryAfterGOAWAY(t *testing.T) {
|
||||
|
||||
// Server for the second request.
|
||||
go func() {
|
||||
var ct *clientTester
|
||||
select {
|
||||
case ct = <-ct2:
|
||||
case <-done:
|
||||
return
|
||||
}
|
||||
ct := <-ct2
|
||||
|
||||
connToClose <- ct.cc
|
||||
ct.greet()
|
||||
@@ -3663,23 +3651,15 @@ func TestTransportRetryAfterGOAWAY(t *testing.T) {
|
||||
}()
|
||||
|
||||
for k := 0; k < 3; k++ {
|
||||
select {
|
||||
case err := <-errs:
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
case <-time.After(1 * time.Second):
|
||||
t.Errorf("timed out")
|
||||
err := <-errs
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
}
|
||||
|
||||
for {
|
||||
select {
|
||||
case c := <-connToClose:
|
||||
c.Close()
|
||||
default:
|
||||
return
|
||||
}
|
||||
close(connToClose)
|
||||
for c := range connToClose {
|
||||
c.Close()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user