From 3a8ab6bef0e9c9d5f96c274ce34c1b6010522689 Mon Sep 17 00:00:00 2001 From: Miha Zupan Date: Mon, 14 Feb 2022 20:18:51 +0100 Subject: [PATCH] Resolve System.Net.Security.Tests.LoggingTest SkipTestException failure --- .../tests/FunctionalTests/LoggingTest.cs | 21 +++++++++---------- .../SslStreamStreamToStreamTest.cs | 1 - 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/LoggingTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/LoggingTest.cs index 1b99f0cd4d85ae..db0c4e9d702c59 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/LoggingTest.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/LoggingTest.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Concurrent; -using System.Diagnostics; using System.Diagnostics.Tracing; using Microsoft.DotNet.RemoteExecutor; using Microsoft.DotNet.XUnitExtensions; @@ -25,28 +24,28 @@ public void EventSource_ExistsWithCorrectId() } [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))] + [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "X509 certificate store is not supported on iOS or tvOS.")] // Match SslStream_StreamToStream_Authentication_Success public void EventSource_EventsRaisedAsExpected() { - if (PlatformDetection.IsWindows10Version22000OrGreater) + RemoteExecutor.Invoke(async () => { - // [ActiveIssue("https://github.com/dotnet/runtime/issues/58927")] - throw new SkipTestException("Unstable on Windows 11"); - } - - RemoteExecutor.Invoke(() => - { - using (var listener = new TestEventListener("Private.InternalDiagnostics.System.Net.Security", EventLevel.Verbose)) + try { + using var listener = new TestEventListener("Private.InternalDiagnostics.System.Net.Security", EventLevel.Verbose); var events = new ConcurrentQueue(); - listener.RunWithCallback(events.Enqueue, () => + await listener.RunWithCallbackAsync(events.Enqueue, async () => { // Invoke tests that'll cause some events to be generated var test = new SslStreamStreamToStreamTest_Async(); - test.SslStream_StreamToStream_Authentication_Success().GetAwaiter().GetResult(); + await test.SslStream_StreamToStream_Authentication_Success(); }); Assert.DoesNotContain(events, ev => ev.EventId == 0); // errors from the EventSource itself Assert.InRange(events.Count, 1, int.MaxValue); } + catch (SkipTestException) + { + // Don't throw inside RemoteExecutor if SslStream_StreamToStream_Authentication_Success chose to skip the test + } }).Dispose(); } } diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs index 4db8e9c34ebd96..bc8e3cf471b3f3 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs @@ -72,7 +72,6 @@ public static IEnumerable SslStream_StreamToStream_Authentication_Succ [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "X509 certificate store is not supported on iOS or tvOS.")] public async Task SslStream_StreamToStream_Authentication_Success(X509Certificate serverCert = null, X509Certificate clientCert = null) { - if (PlatformDetection.IsWindows10Version20348OrGreater) { // [ActiveIssue("https://github.com/dotnet/runtime/issues/58927")]