grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: fix flaky test ClientSendsAGoAway (#7224)

This commit is contained in:
Abhishek Ranjan 2024-05-22 23:48:28 +05:30 committed by GitHub
parent c822adf26b
commit a639c40f57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/goaway_test.go
View File

@ -770,36 +770,20 @@ func (s) TestClientSendsAGoAway(t *testing.T) {
if err != nil {
t.Fatalf("error listening: %v", err)
}
ctCh := testutils.NewChannel()
defer lis.Close()
goAwayReceived := make(chan struct{})
errCh := make(chan error)
go func() {
conn, err := lis.Accept()
if err != nil {
t.Errorf("error in lis.Accept(): %v", err)
}
ct := newClientTester(t, conn)
ctCh.Send(ct)
}()
defer lis.Close()
cc, err := grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
t.Fatalf("error dialing: %v", err)
}
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
defer cancel()
val, err := ctCh.Receive(ctx)
if err != nil {
t.Fatalf("timeout waiting for client transport (should be given after http2 creation)")
}
ct := val.(*clientTester)
goAwayReceived := make(chan struct{})
errCh := make(chan error)
go func() {
defer ct.conn.Close()
for {
f, err := ct.fr.ReadFrame()
if err != nil {
errCh <- fmt.Errorf("error reading frame: %v", err)
return
}
switch fr := f.(type) {
@ -808,6 +792,7 @@ func (s) TestClientSendsAGoAway(t *testing.T) {
if fr.ErrCode == http2.ErrCodeNo {
t.Logf("GoAway received from client")
close(goAwayReceived)
return
}
default:
t.Errorf("server tester received unexpected frame type %T", f)
@ -816,8 +801,18 @@ func (s) TestClientSendsAGoAway(t *testing.T) {
}
}
}()
cc, err := grpc.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
t.Fatalf("error dialing: %v", err)
}
cc.Connect()
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
defer cancel()
testutils.AwaitState(ctx, t, cc, connectivity.Ready)
cc.Close()
defer ct.conn.Close()
select {
case <-goAwayReceived:
case err := <-errCh: