Merge in 'release/6.0' changes

dotnet · Mar 11, 2022 · 7a7c54b · 7a7c54b
2 parents 8d7b562 + d0c82a3
commit 7a7c54b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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 (AuthenticationException ex)
                 {
                     // 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
@@ -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";