diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs index 47b727a7a591fe..1923a18e841f33 100644 --- a/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs +++ b/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs @@ -5,7 +5,6 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using Microsoft.Quic; - using static Microsoft.Quic.MsQuic; #if TARGET_WINDOWS diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs index 65e7a4bfb9237e..5383840eaa1d0c 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs @@ -38,6 +38,7 @@ public async Task SupportedLinuxPlatformsWithMsQuic_IsSupportedIsTrue() find.StartInfo.FileName = "find"; find.StartInfo.Arguments = "/usr/ -iname libmsquic.so*"; find.StartInfo.RedirectStandardOutput = true; + find.StartInfo.RedirectStandardError = true; find.Start(); string output = await find.StandardOutput.ReadToEndAsync(); _output.WriteLine(output); diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs index 12df548a360323..e00f758965a7a5 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs @@ -203,7 +203,6 @@ public Task Listener_BacklogLimitRefusesConnection_ParallelClients_ClientThrows( [InlineData(100, 101)] [InlineData(15, 100)] [InlineData(10, 1_000)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/82769", typeof(PlatformDetection), nameof(PlatformDetection.IsArmOrArm64Process))] [OuterLoop("Higher number of connections slow the test down.")] private Task Listener_BacklogLimitRefusesConnection_ParallelClients_ClientThrows_Slow(int backlogLimit, int connectCount) => Listener_BacklogLimitRefusesConnection_ParallelClients_ClientThrows_Core(backlogLimit, connectCount); diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs index 2560723bfade49..34872a740e1fbf 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs @@ -13,6 +13,8 @@ using Xunit.Abstractions; using System.Diagnostics.Tracing; using System.Net.Sockets; +using Microsoft.Quic; +using static Microsoft.Quic.MsQuic; namespace System.Net.Quic.Tests { @@ -40,10 +42,25 @@ public abstract class QuicTestBase : IDisposable public const int PassingTestTimeoutMilliseconds = 4 * 60 * 1000; public static TimeSpan PassingTestTimeout => TimeSpan.FromMilliseconds(PassingTestTimeoutMilliseconds); - public QuicTestBase(ITestOutputHelper output) + static unsafe QuicTestBase() + { + Console.WriteLine($"MsQuic {(IsSupported ? "supported" : "not supported")} and using '{MsQuicApi.MsQuicLibraryVersion}'."); + + if (IsSupported) + { + QUIC_SETTINGS settings = default(QUIC_SETTINGS); + settings.IsSet.MaxWorkerQueueDelayUs = 1; + settings.MaxWorkerQueueDelayUs = 2_500_000u; // 2.5s, 10x the default + if (StatusFailed(MsQuicApi.Api.ApiTable->SetParam(null, QUIC_PARAM_GLOBAL_SETTINGS, (uint)sizeof(QUIC_SETTINGS), (byte*)&settings))) + { + Console.WriteLine($"Unable to set MsQuic MaxWorkerQueueDelayUs."); + } + } + } + + public unsafe QuicTestBase(ITestOutputHelper output) { _output = output; - _output.WriteLine($"Using {MsQuicApi.MsQuicLibraryVersion}"); } public void Dispose()