From 514f595efa8a04a36c5c76eda7689d4b2e0a49db Mon Sep 17 00:00:00 2001 From: wfurt Date: Tue, 8 Feb 2022 05:19:45 +0000 Subject: [PATCH 1/2] improve SslStream tests on misconfigured systems --- .../tests/FunctionalTests/ServerAsyncAuthenticateTest.cs | 2 +- .../tests/FunctionalTests/TestConfiguration.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/ServerAsyncAuthenticateTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/ServerAsyncAuthenticateTest.cs index 73d480a3048588..be301a6559d146 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/ServerAsyncAuthenticateTest.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/ServerAsyncAuthenticateTest.cs @@ -387,7 +387,7 @@ private async Task ServerAsyncSslHelper( await clientAuthentication.WaitAsync(TestConfiguration.PassingTestTimeout); _logVerbose.WriteLine("ServerAsyncAuthenticateTest.clientAuthentication complete."); } - catch (Exception ex) + catch (Exception ex) when (ex is AuthenticationException) { // Ignore client-side errors: we're only interested in server-side behavior. _log.WriteLine("Client exception : " + ex); diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/TestConfiguration.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/TestConfiguration.cs index 4bd1b0ee30f9a2..82cbe9f14f8ef8 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/TestConfiguration.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/TestConfiguration.cs @@ -13,7 +13,7 @@ namespace System.Net.Security.Tests { internal static class TestConfiguration { - public const int PassingTestTimeoutMilliseconds = 4 * 60 * 1000; + public const int PassingTestTimeoutMilliseconds = 1 * 60 * 1000; public static TimeSpan PassingTestTimeout => TimeSpan.FromMilliseconds(PassingTestTimeoutMilliseconds); public const string Realm = "TEST.COREFX.NET"; From e95df57deb89f171fff7785803cb242e0abd4d54 Mon Sep 17 00:00:00 2001 From: wfurt Date: Tue, 8 Feb 2022 17:55:31 +0000 Subject: [PATCH 2/2] feedback from review --- .../tests/FunctionalTests/ServerAsyncAuthenticateTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/ServerAsyncAuthenticateTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/ServerAsyncAuthenticateTest.cs index be301a6559d146..345cfd41013974 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/ServerAsyncAuthenticateTest.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/ServerAsyncAuthenticateTest.cs @@ -387,7 +387,7 @@ private async Task ServerAsyncSslHelper( await clientAuthentication.WaitAsync(TestConfiguration.PassingTestTimeout); _logVerbose.WriteLine("ServerAsyncAuthenticateTest.clientAuthentication complete."); } - catch (Exception ex) when (ex is AuthenticationException) + catch (AuthenticationException ex) { // Ignore client-side errors: we're only interested in server-side behavior. _log.WriteLine("Client exception : " + ex);