[HTTP/3] Add null check in case we can't get H/3 inboundControlStream (…

…#104797) * Add null check for inboundControlStream on Closing Path * Enable disabled H/3 test
dotnet · Jul 13, 2024 · ac0eeb0 · ac0eeb0
1 parent 46338d5
commit ac0eeb0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs b/src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs
@@ -315,8 +315,11 @@ public async Task WaitForClientDisconnectAsync(bool refuseNewRequests = true)
 
             // The client's control stream should throw QuicConnectionAbortedException, indicating that it was
             // aborted because the connection was closed (and was not explicitly closed or aborted prior to the connection being closed)
-            QuicException ex = await Assert.ThrowsAsync<QuicException>(async () => await _inboundControlStream.ReadFrameAsync().ConfigureAwait(false));
-            Assert.Equal(QuicError.ConnectionAborted, ex.QuicError);
+            if (_inboundControlStream is not null)
+            {
+                QuicException ex = await Assert.ThrowsAsync<QuicException>(async () => await _inboundControlStream.ReadFrameAsync().ConfigureAwait(false));
+                Assert.Equal(QuicError.ConnectionAborted, ex.QuicError);
+            }
 
             await CloseAsync(H3_NO_ERROR).ConfigureAwait(false);
         }

diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs
@@ -237,12 +237,6 @@ await RemoteExecutor.Invoke(async (useVersion, testAsync) =>
         [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
         public async Task SendAsync_ExpectedDiagnosticCancelledLogging()
         {
-            if (UseVersion == HttpVersion30)
-            {
-                // [ActiveIssue("https://github.com/dotnet/runtime/issues/104699")]
-                throw new SkipTestException("SendAsync_ExpectedDiagnosticCancelledLogging is broken on HTTP/3.");
-            }
-
             await RemoteExecutor.Invoke(async (useVersion, testAsync) =>
             {
                 TaskCompletionSource responseLoggedTcs = new(TaskCreationOptions.RunContinuationsAsynchronously);