Skip to content

Fix flaky Http2 test by using consistent ConnectionEndReason for closed streams #65456

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

Merged
adityamandaleeka merged 3 commits into from
Feb 19, 2026
Merged

Fix flaky Http2 test by using consistent ConnectionEndReason for closed streams #65456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e23536
Fix race in RST_STREAM_IncompleteRequest tests
adityamandaleeka Feb 17, 2026
7366b53
Fix flaky Http2 test by using consistent ConnectionEndReason for clos…
adityamandaleeka Feb 18, 2026
9a5ec0c
Update remaining test assertions to use FrameAfterStreamClose.
adityamandaleeka Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ private Task ProcessDataFrameAsync(in ReadOnlySequence<byte> payload)
//
// We choose to do that here so we don't have to keep state to track implicitly closed
// streams vs. streams closed with END_STREAM or RST_STREAM.
throw new Http2ConnectionErrorException(CoreStrings.FormatHttp2ErrorStreamClosed(_incomingFrame.Type, _incomingFrame.StreamId), Http2ErrorCode.STREAM_CLOSED, ConnectionEndReason.UnknownStream);
throw new Http2ConnectionErrorException(CoreStrings.FormatHttp2ErrorStreamClosed(_incomingFrame.Type, _incomingFrame.StreamId), Http2ErrorCode.STREAM_CLOSED, ConnectionEndReason.FrameAfterStreamClose);
}

private Http2ConnectionErrorException CreateReceivedFrameStreamAbortedException(Http2Stream stream)
Expand Down
14 changes: 8 additions & 6 deletions src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1639,7 +1639,7 @@ await WaitForConnectionErrorAsync<Http2ConnectionErrorException>(
CoreStrings.FormatHttp2ErrorStreamClosed(Http2FrameType.DATA, streamId: 1),
CoreStrings.FormatHttp2ErrorStreamHalfClosedRemote(Http2FrameType.DATA, streamId: 1)
});
AssertConnectionEndReason(ConnectionEndReason.UnknownStream);
AssertConnectionEndReason(ConnectionEndReason.FrameAfterStreamClose);
}

[Fact]
Expand Down Expand Up @@ -1853,7 +1853,7 @@ await WaitForConnectionErrorAsync<Http2ConnectionErrorException>(
expectedErrorCode: Http2ErrorCode.STREAM_CLOSED,
expectedErrorMessage: CoreStrings.FormatHttp2ErrorStreamClosed(Http2FrameType.DATA, streamId: 1));

AssertConnectionEndReason(ConnectionEndReason.UnknownStream);
AssertConnectionEndReason(ConnectionEndReason.FrameAfterStreamClose);
}

[Fact]
Expand Down Expand Up @@ -3549,11 +3549,12 @@ public async Task RST_STREAM_IncompleteRequest_AdditionalDataFrames_ConnectionAb
await SendDataAsync(1, new byte[2], endStream: false);
await SendRstStreamAsync(1);
await SendDataAsync(1, new byte[10], endStream: false);
tcs.TrySetResult();

await WaitForConnectionErrorAsync<Http2ConnectionErrorException>(ignoreNonGoAwayFrames: false, expectedLastStreamId: 1,
Http2ErrorCode.STREAM_CLOSED, CoreStrings.FormatHttp2ErrorStreamAborted(Http2FrameType.DATA, 1));

tcs.TrySetResult(); // Don't let the response start until after the abort

AssertConnectionEndReason(ConnectionEndReason.FrameAfterStreamClose);
}

Expand All @@ -3575,11 +3576,12 @@ public async Task RST_STREAM_IncompleteRequest_AdditionalTrailerFrames_Connectio
await SendDataAsync(1, new byte[2], endStream: false);
await SendRstStreamAsync(1);
await SendHeadersAsync(1, Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM, _requestTrailers);
tcs.TrySetResult();

await WaitForConnectionErrorAsync<Http2ConnectionErrorException>(ignoreNonGoAwayFrames: false, expectedLastStreamId: 1,
Http2ErrorCode.STREAM_CLOSED, CoreStrings.FormatHttp2ErrorStreamAborted(Http2FrameType.HEADERS, 1));

tcs.TrySetResult(); // Don't let the response start until after the abort

AssertConnectionEndReason(ConnectionEndReason.FrameAfterStreamClose);
}

Expand Down Expand Up @@ -5742,7 +5744,7 @@ await WaitForConnectionErrorAsync<Http2ConnectionErrorException>(
CoreStrings.FormatHttp2ErrorStreamClosed(Http2FrameType.DATA, streamId: 1),
CoreStrings.FormatHttp2ErrorStreamHalfClosedRemote(Http2FrameType.DATA, streamId: 1)
});
AssertConnectionEndReason(ConnectionEndReason.UnknownStream);
AssertConnectionEndReason(ConnectionEndReason.FrameAfterStreamClose);
break;

case Http2FrameType.HEADERS:
Expand Down Expand Up @@ -5833,7 +5835,7 @@ await WaitForConnectionErrorAsync<Http2ConnectionErrorException>(
switch (finalFrameType)
{
case Http2FrameType.DATA:
AssertConnectionEndReason(ConnectionEndReason.UnknownStream);
AssertConnectionEndReason(ConnectionEndReason.FrameAfterStreamClose);
break;

case Http2FrameType.HEADERS:
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ await WaitForConnectionErrorAsyncDoNotCloseTransport<Http2ConnectionErrorExcepti
switch (finalFrameType)
{
case Http2FrameType.DATA:
AssertConnectionEndReason(ConnectionEndReason.UnknownStream);
AssertConnectionEndReason(ConnectionEndReason.FrameAfterStreamClose);
break;

case Http2FrameType.CONTINUATION:
Expand Down
Loading