From 32ead76b7c2ce64cb16a09c5691d3991c367dafa Mon Sep 17 00:00:00 2001 From: Tomas Weinfurt Date: Fri, 16 Oct 2020 14:45:24 -0700 Subject: [PATCH] adjust renegotiation tests to match product change (#43123) * adjust renegotiation tests to match product change * add assert for validationCount --- .../tests/FunctionalTests/SslStreamAllowRenegotiationTests.cs | 5 ++--- .../tests/FunctionalTests/SslStreamNetworkStreamTest.cs | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamAllowRenegotiationTests.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamAllowRenegotiationTests.cs index b2becd6..7520221 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamAllowRenegotiationTests.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamAllowRenegotiationTests.cs @@ -54,15 +54,14 @@ namespace System.Net.Security.Tests Assert.True(ssl.IsAuthenticated); Assert.True(ssl.IsEncrypted); - // Issue request that triggers regotiation from server. + // Issue request that triggers renegotiation from server. byte[] message = Encoding.UTF8.GetBytes("GET /EchoClientCertificate.ashx HTTP/1.1\r\nHost: corefx-net-tls.azurewebsites.net\r\n\r\n"); await ssl.WriteAsync(message, 0, message.Length); // Initiate Read operation, that results in starting renegotiation as per server response to the above request. int bytesRead = await ssl.ReadAsync(message, 0, message.Length); - // Renegotiation will trigger another validation callback/ - Assert.InRange(validationCount, 2, int.MaxValue); + Assert.Equal(1, validationCount); Assert.InRange(bytesRead, 1, message.Length); Assert.Contains("HTTP/1.1 200 OK", Encoding.UTF8.GetString(message)); } diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs index f2cc235..ce8c262 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs @@ -201,8 +201,7 @@ namespace System.Net.Security.Tests // Initiate Read operation, that results in starting renegotiation as per server response to the above request. int bytesRead = useSync ? ssl.Read(message, 0, message.Length) : await ssl.ReadAsync(message, 0, message.Length); - // renegotiation will trigger validation callback again. - Assert.InRange(validationCount, 2, int.MaxValue); + Assert.Equal(1, validationCount); Assert.InRange(bytesRead, 1, message.Length); Assert.Contains("HTTP/1.1 200 OK", Encoding.UTF8.GetString(message)); } -- 2.7.4