From baeb2983ca526d3bfcda091000ecd8e48dc3aa5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marie=20P=C3=ADchov=C3=A1?= <11718369+ManickaP@users.noreply.github.com> Date: Thu, 4 Jan 2024 15:57:47 +0100 Subject: [PATCH] [QUIC] Disable QUIC tests on CLR stress tests (#96392) * Disable QUIC tests on CLR stress tests * Exclude only Arm32 CLR stress tests --- .../tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs | 2 +- .../tests/FunctionalTests/MsQuicRemoteExecutorTests.cs | 2 +- .../System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs | 2 +- .../tests/FunctionalTests/QuicConnectionTests.cs | 2 +- .../System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs | 2 +- .../QuicStreamConnectedStreamConformanceTests.cs | 2 +- .../System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs | 2 +- .../System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs | 1 + 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs index df827e64feada..459b9bce810dc 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs @@ -9,7 +9,7 @@ namespace System.Net.Quic.Tests { [Collection(nameof(DisableParallelization))] - [ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported))] + [ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest))] [SkipOnPlatform(TestPlatforms.Windows, "CipherSuitesPolicy is not supported on Windows")] public class MsQuicCipherSuitesPolicyTests : QuicTestBase { diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicRemoteExecutorTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicRemoteExecutorTests.cs index 4cab4fa3063b7..051ead9b3bb2e 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicRemoteExecutorTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicRemoteExecutorTests.cs @@ -13,7 +13,7 @@ namespace System.Net.Quic.Tests { [Collection(nameof(DisableParallelization))] - [ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported))] + [ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest))] public class MsQuicRemoteExecutorTests : QuicTestBase { public MsQuicRemoteExecutorTests() diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs index fe2e74fd72604..aa3374ef28ea5 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs @@ -47,7 +47,7 @@ public void Dispose() } [Collection(nameof(DisableParallelization))] - [ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported))] + [ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest))] public class MsQuicTests : QuicTestBase, IClassFixture { private static byte[] s_data = "Hello world!"u8.ToArray(); diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicConnectionTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicConnectionTests.cs index 61d42b2525480..9e58cab98c095 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicConnectionTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicConnectionTests.cs @@ -14,7 +14,7 @@ namespace System.Net.Quic.Tests using Configuration = System.Net.Test.Common.Configuration; [Collection(nameof(DisableParallelization))] - [ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported))] + [ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest))] public sealed class QuicConnectionTests : QuicTestBase { const int ExpectedErrorCode = 1234; diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs index 56767f72a82c9..d9e27a9e394c4 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicListenerTests.cs @@ -14,7 +14,7 @@ namespace System.Net.Quic.Tests { [Collection(nameof(DisableParallelization))] - [ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported))] + [ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest))] public sealed class QuicListenerTests : QuicTestBase { public QuicListenerTests(ITestOutputHelper output) : base(output) { } diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamConnectedStreamConformanceTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamConnectedStreamConformanceTests.cs index 762fc4230abc0..e224bf75c5531 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamConnectedStreamConformanceTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamConnectedStreamConformanceTests.cs @@ -15,7 +15,7 @@ namespace System.Net.Quic.Tests { [Collection(nameof(DisableParallelization))] - [ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported))] + [ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest))] public sealed class QuicStreamConformanceTests : ConnectedStreamConformanceTests { protected override bool UsableAfterCanceledReads => false; diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs index 4a4178c870891..72d0995823edc 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs @@ -13,7 +13,7 @@ namespace System.Net.Quic.Tests { [Collection(nameof(DisableParallelization))] - [ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported))] + [ConditionalClass(typeof(QuicTestBase), nameof(QuicTestBase.IsSupported), nameof(QuicTestBase.IsNotArm32CoreClrStressTest))] public sealed class QuicStreamTests : QuicTestBase { private static byte[] s_data = "Hello world!"u8.ToArray(); diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs index 7388fcbeda804..79992aef5f16c 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs @@ -29,6 +29,7 @@ public abstract class QuicTestBase : IDisposable private static readonly byte[] s_pong = "PONG"u8.ToArray(); public static bool IsSupported => QuicListener.IsSupported && QuicConnection.IsSupported; + public static bool IsNotArm32CoreClrStressTest => !(CoreClrConfigurationDetection.IsStressTest && PlatformDetection.IsArmProcess); private static readonly Lazy _isIPv6Available = new Lazy(GetIsIPv6Available); public static bool IsIPv6Available => _isIPv6Available.Value;