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>
diff --git a/http2/transport_test.go b/http2/transport_test.go
index 4cc064c..13a3160 100644
--- a/http2/transport_test.go
+++ b/http2/transport_test.go
@@ -3582,8 +3582,6 @@
}
errs := make(chan error, 3)
- done := make(chan struct{})
- defer close(done)
// Client.
go func() {
@@ -3605,12 +3603,7 @@
// 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 @@
// 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 @@
}()
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()
}
}
