Skip to content

Commit 48c55c0

Browse files
authored
fix(test): relax EOF assertion for concurrent triple stream tests (#3062)
1 parent 1a7b169 commit 48c55c0

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

protocol/triple/triple_protocol/triple_ext_test.go

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,7 +1486,10 @@ func TestBidiStreamServerSendsFirstMessage(t *testing.T) {
14861486
assert.Nil(t, stream.CloseRequest())
14871487
assert.Nil(t, stream.CloseResponse())
14881488
})
1489-
assert.Nil(t, stream.Send(nil))
1489+
// tolerate EOF when server closes stream concurrently
1490+
if err = stream.Send(nil); err != nil {
1491+
assert.ErrorIs(t, err, io.EOF)
1492+
}
14901493
select {
14911494
case <-time.After(time.Second):
14921495
t.Error("timed out to get request headers")
@@ -1523,7 +1526,10 @@ func TestStreamForServer(t *testing.T) {
15231526
t.Cleanup(server.Close)
15241527
stream, err := client.CumSum(context.Background())
15251528
assert.Nil(t, err)
1526-
assert.Nil(t, stream.Send(nil))
1529+
// tolerate EOF when server closes stream concurrently
1530+
if err = stream.Send(nil); err != nil {
1531+
assert.ErrorIs(t, err, io.EOF)
1532+
}
15271533
err = stream.Receive(&pingv1.CumSumResponse{})
15281534
assert.NotNil(t, err)
15291535
assert.Equal(t, triple.CodeOf(err), triple.CodeInternal)
@@ -1539,7 +1545,10 @@ func TestStreamForServer(t *testing.T) {
15391545
t.Cleanup(server.Close)
15401546
stream, err := client.CumSum(context.Background())
15411547
assert.Nil(t, err)
1542-
assert.Nil(t, stream.Send(nil))
1548+
// tolerate EOF when server closes stream concurrently
1549+
if err = stream.Send(nil); err != nil {
1550+
assert.ErrorIs(t, err, io.EOF)
1551+
}
15431552
err = stream.Receive(&pingv1.CumSumResponse{})
15441553
assert.NotNil(t, err)
15451554
assert.Equal(t, triple.CodeOf(err), triple.CodeUnknown)
@@ -1558,7 +1567,10 @@ func TestStreamForServer(t *testing.T) {
15581567
t.Cleanup(server.Close)
15591568
stream, err := client.CumSum(context.Background())
15601569
assert.Nil(t, err)
1561-
assert.Nil(t, stream.Send(nil))
1570+
// tolerate EOF when server closes stream concurrently
1571+
if err = stream.Send(nil); err != nil {
1572+
assert.ErrorIs(t, err, io.EOF)
1573+
}
15621574
assert.Nil(t, stream.CloseRequest())
15631575
})
15641576
t.Run("server-stream", func(t *testing.T) {

0 commit comments

Comments
 (0)