Skip to content

Commit 69a7880

Browse files
fraenkelBryan C. Mills
authored andcommitted
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 <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Bryan C. Mills <[email protected]> Trust: Dmitri Shuralyov <[email protected]>
1 parent a11eb1b commit 69a7880

File tree

1 file changed

+8
-28
lines changed

1 file changed

+8
-28
lines changed

http2/transport_test.go

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3582,8 +3582,6 @@ func TestTransportRetryAfterGOAWAY(t *testing.T) {
35823582
}
35833583

35843584
errs := make(chan error, 3)
3585-
done := make(chan struct{})
3586-
defer close(done)
35873585

35883586
// Client.
35893587
go func() {
@@ -3605,12 +3603,7 @@ func TestTransportRetryAfterGOAWAY(t *testing.T) {
36053603

36063604
// Server for the first request.
36073605
go func() {
3608-
var ct *clientTester
3609-
select {
3610-
case ct = <-ct1:
3611-
case <-done:
3612-
return
3613-
}
3606+
ct := <-ct1
36143607

36153608
connToClose <- ct.cc
36163609
ct.greet()
@@ -3629,12 +3622,7 @@ func TestTransportRetryAfterGOAWAY(t *testing.T) {
36293622

36303623
// Server for the second request.
36313624
go func() {
3632-
var ct *clientTester
3633-
select {
3634-
case ct = <-ct2:
3635-
case <-done:
3636-
return
3637-
}
3625+
ct := <-ct2
36383626

36393627
connToClose <- ct.cc
36403628
ct.greet()
@@ -3663,23 +3651,15 @@ func TestTransportRetryAfterGOAWAY(t *testing.T) {
36633651
}()
36643652

36653653
for k := 0; k < 3; k++ {
3666-
select {
3667-
case err := <-errs:
3668-
if err != nil {
3669-
t.Error(err)
3670-
}
3671-
case <-time.After(1 * time.Second):
3672-
t.Errorf("timed out")
3654+
err := <-errs
3655+
if err != nil {
3656+
t.Error(err)
36733657
}
36743658
}
36753659

3676-
for {
3677-
select {
3678-
case c := <-connToClose:
3679-
c.Close()
3680-
default:
3681-
return
3682-
}
3660+
close(connToClose)
3661+
for c := range connToClose {
3662+
c.Close()
36833663
}
36843664
}
36853665

0 commit comments

Comments
 (0)