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

adityamandaleeka · web-flow · commit 97c3db9ecd28 · 2026-02-18T23:00:19.000-08:00
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs
@@ -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)
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs
@@ -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]
@@ -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]
@@ -5744,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:
@@ -5835,7 +5835,7 @@ await WaitForConnectionErrorAsync<Http2ConnectionErrorException>(
         switch (finalFrameType)
         {
             case Http2FrameType.DATA:
-                AssertConnectionEndReason(ConnectionEndReason.UnknownStream);
+                AssertConnectionEndReason(ConnectionEndReason.FrameAfterStreamClose);
                 break;
 
             case Http2FrameType.HEADERS:
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs
@@ -304,7 +304,7 @@ await WaitForConnectionErrorAsyncDoNotCloseTransport<Http2ConnectionErrorExcepti
         switch (finalFrameType)
         {
             case Http2FrameType.DATA:
-                AssertConnectionEndReason(ConnectionEndReason.UnknownStream);
+                AssertConnectionEndReason(ConnectionEndReason.FrameAfterStreamClose);
                 break;
 
             case Http2FrameType.CONTINUATION:

Original file line number	Diff line number	Diff line change
`@@ -754,7 +754,7 @@ private Task ProcessDataFrameAsync(in ReadOnlySequence<byte> payload)`
`754`	`754`	`//`
`755`	`755`	`// We choose to do that here so we don't have to keep state to track implicitly closed`
`756`	`756`	`// streams vs. streams closed with END_STREAM or RST_STREAM.`
`757`		`- throw new Http2ConnectionErrorException(CoreStrings.FormatHttp2ErrorStreamClosed(_incomingFrame.Type, _incomingFrame.StreamId), Http2ErrorCode.STREAM_CLOSED, ConnectionEndReason.UnknownStream);`
	`757`	`+ throw new Http2ConnectionErrorException(CoreStrings.FormatHttp2ErrorStreamClosed(_incomingFrame.Type, _incomingFrame.StreamId), Http2ErrorCode.STREAM_CLOSED, ConnectionEndReason.FrameAfterStreamClose);`
`758`	`758`	`}`
`759`	`759`
`760`	`760`	`private Http2ConnectionErrorException CreateReceivedFrameStreamAbortedException(Http2Stream stream)`
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ await WaitForConnectionErrorAsyncDoNotCloseTransport<Http2ConnectionErrorExcepti`
`304`	`304`	`switch (finalFrameType)`
`305`	`305`	`{`
`306`	`306`	`case Http2FrameType.DATA:`
`307`		`- AssertConnectionEndReason(ConnectionEndReason.UnknownStream);`
	`307`	`+ AssertConnectionEndReason(ConnectionEndReason.FrameAfterStreamClose);`
`308`	`308`	`break;`
`309`	`309`
`310`	`310`	`case Http2FrameType.CONTINUATION:`