Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: fix flaky test ClientSendsAGoAway #7224

Merged
merged 3 commits into from
May 22, 2024
Merged

test: fix flaky test ClientSendsAGoAway #7224

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
429165c
fix: Flaky test ClientSendsAGoAway
aranjans May 10, 2024
5740160
resolve comments
aranjans May 14, 2024
95b4c7f
refactor
aranjans May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 17 additions & 22 deletions test/goaway_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
dfawley marked this conversation as resolved.
Show resolved Hide resolved
f, err := ct.fr.ReadFrame()
if err != nil {
errCh <- fmt.Errorf("error reading frame: %v", err)
return
}
switch fr := f.(type) {
Expand All @@ -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)
Expand All @@ -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:
Expand Down