From b5598ce6f036022550836bcfee0d7826fe086d29 Mon Sep 17 00:00:00 2001 From: wfurt Date: Thu, 2 Mar 2023 22:15:02 -0800 Subject: [PATCH 1/2] use PlatformSpecific attribute to supress platform specific Quic tests --- .../FunctionalTests/MsQuicPlatformDetectionTests.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs index 5c8d37576d94b..9064097de5f35 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs @@ -23,7 +23,8 @@ public void UnsupportedPlatforms_ThrowsPlatformNotSupportedException() [ActiveIssue("https://github.com/dotnet/runtime/issues/73290", typeof(PlatformDetection), nameof(PlatformDetection.IsSingleFile))] [ActiveIssue("https://github.com/dotnet/runtime/issues/82885", typeof(PlatformDetection), nameof(PlatformDetection.IsArm64Process))] - [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsWindows), nameof(PlatformDetection.SupportsTls13))] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.SupportsTls13))] + [PlatformSpecific(TestPlatforms.Windows)] public void SupportedWindowsPlatforms_IsSupportedIsTrue() { Assert.True(QuicListener.IsSupported); @@ -31,7 +32,8 @@ public void SupportedWindowsPlatforms_IsSupportedIsTrue() } [ActiveIssue("https://github.com/dotnet/runtime/issues/81901", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine314), nameof(PlatformDetection.IsInContainer))] - [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsLinux))] + [Fact] + [PlatformSpecific(TestPlatforms.Linux)] public async Task SupportedLinuxPlatformsWithMsQuic_IsSupportedIsTrue() { using Process find = new Process(); @@ -61,7 +63,8 @@ public async Task SupportedLinuxPlatformsWithMsQuic_IsSupportedIsTrue() [ActiveIssue("https://github.com/dotnet/runtime/issues/82154", typeof(PlatformDetection), nameof(PlatformDetection.IsRaspbian10), nameof(PlatformDetection.IsArmv6Process), nameof(PlatformDetection.IsInContainer))] [ActiveIssue("https://github.com/dotnet/runtime/issues/82154", typeof(PlatformDetection), nameof(PlatformDetection.IsUbuntu2004), nameof(PlatformDetection.IsPpc64leProcess))] [ActiveIssue("https://github.com/dotnet/runtime/issues/82154", typeof(PlatformDetection), nameof(PlatformDetection.IsUbuntu2004), nameof(PlatformDetection.IsS390xProcess))] - [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsLinux), nameof(PlatformDetection.IsInHelix))] + [Fact] + [PlatformSpecific(TestPlatforms.Linux)] public void SupportedLinuxPlatforms_IsSupportedIsTrue() { _output.WriteLine($"Running on {PlatformDetection.GetDistroVersionString()}"); From 25cd41a01073167e5a679d3220b26fc060fa749c Mon Sep 17 00:00:00 2001 From: Tomas Weinfurt Date: Fri, 3 Mar 2023 10:29:20 -0800 Subject: [PATCH 2/2] Update src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs Co-authored-by: Stephen Toub --- .../tests/FunctionalTests/MsQuicPlatformDetectionTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs index 9064097de5f35..6d84455daaefc 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs @@ -63,7 +63,7 @@ public async Task SupportedLinuxPlatformsWithMsQuic_IsSupportedIsTrue() [ActiveIssue("https://github.com/dotnet/runtime/issues/82154", typeof(PlatformDetection), nameof(PlatformDetection.IsRaspbian10), nameof(PlatformDetection.IsArmv6Process), nameof(PlatformDetection.IsInContainer))] [ActiveIssue("https://github.com/dotnet/runtime/issues/82154", typeof(PlatformDetection), nameof(PlatformDetection.IsUbuntu2004), nameof(PlatformDetection.IsPpc64leProcess))] [ActiveIssue("https://github.com/dotnet/runtime/issues/82154", typeof(PlatformDetection), nameof(PlatformDetection.IsUbuntu2004), nameof(PlatformDetection.IsS390xProcess))] - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsInHelix))] [PlatformSpecific(TestPlatforms.Linux)] public void SupportedLinuxPlatforms_IsSupportedIsTrue() {