File tree Expand file tree Collapse file tree 1 file changed +8
-28
lines changed Expand file tree Collapse file tree 1 file changed +8
-28
lines changed Original file line number Diff line number Diff line change @@ -3582,8 +3582,6 @@ func TestTransportRetryAfterGOAWAY(t *testing.T) {
3582
3582
}
3583
3583
3584
3584
errs := make (chan error , 3 )
3585
- done := make (chan struct {})
3586
- defer close (done )
3587
3585
3588
3586
// Client.
3589
3587
go func () {
@@ -3605,12 +3603,7 @@ func TestTransportRetryAfterGOAWAY(t *testing.T) {
3605
3603
3606
3604
// Server for the first request.
3607
3605
go func () {
3608
- var ct * clientTester
3609
- select {
3610
- case ct = <- ct1 :
3611
- case <- done :
3612
- return
3613
- }
3606
+ ct := <- ct1
3614
3607
3615
3608
connToClose <- ct .cc
3616
3609
ct .greet ()
@@ -3629,12 +3622,7 @@ func TestTransportRetryAfterGOAWAY(t *testing.T) {
3629
3622
3630
3623
// Server for the second request.
3631
3624
go func () {
3632
- var ct * clientTester
3633
- select {
3634
- case ct = <- ct2 :
3635
- case <- done :
3636
- return
3637
- }
3625
+ ct := <- ct2
3638
3626
3639
3627
connToClose <- ct .cc
3640
3628
ct .greet ()
@@ -3663,23 +3651,15 @@ func TestTransportRetryAfterGOAWAY(t *testing.T) {
3663
3651
}()
3664
3652
3665
3653
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 )
3673
3657
}
3674
3658
}
3675
3659
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 ()
3683
3663
}
3684
3664
}
3685
3665
You can’t perform that action at this time.
0 commit comments