From 81a8ba034791b21f6aca676db3b3787137cb3a1f Mon Sep 17 00:00:00 2001 From: Cesar Blum Silveira Date: Fri, 23 Dec 2016 17:38:54 -0800 Subject: [PATCH] Skip tests commentd out in 973b705. --- .../AddressRegistrationTests.cs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs index 4cf30fc687..e2513ece90 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs @@ -35,16 +35,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await RegisterAddresses_Success(addressInput, testUrls); } - // SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698) - //[ConditionalTheory, MemberData(nameof(AddressRegistrationDataIPv4Port443))] + [ConditionalTheory(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)"), MemberData(nameof(AddressRegistrationDataIPv4Port443))] [PortSupportedCondition(443)] public async Task RegisterAddresses_IPv4Port443_Success(string addressInput, Func testUrls) { await RegisterAddresses_Success(addressInput, testUrls); } - // SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698) - //[ConditionalTheory, MemberData(nameof(AddressRegistrationDataIPv6))] + [ConditionalTheory(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)"), MemberData(nameof(AddressRegistrationDataIPv6))] [IPv6SupportedCondition] public async Task RegisterAddresses_IPv6_Success(string addressInput, Func testUrls) { @@ -59,8 +57,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await RegisterAddresses_Success(addressInput, testUrls); } - // SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698) - //[ConditionalTheory, MemberData(nameof(AddressRegistrationDataIPv6Port443))] + [ConditionalTheory(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)"), MemberData(nameof(AddressRegistrationDataIPv6Port443))] [IPv6SupportedCondition] [PortSupportedCondition(443)] public async Task RegisterAddresses_IPv6Port443_Success(string addressInput, Func testUrls) @@ -68,8 +65,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await RegisterAddresses_Success(addressInput, testUrls); } - // SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698) - //[ConditionalTheory, MemberData(nameof(AddressRegistrationDataIPv6ScopeId))] + [ConditionalTheory(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)"), MemberData(nameof(AddressRegistrationDataIPv6ScopeId))] [IPv6SupportedCondition] public async Task RegisterAddresses_IPv6ScopeId_Success(string addressInput, Func testUrls) { @@ -92,7 +88,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests foreach (var testUrl in testUrls(host.ServerFeatures.Get())) { - var response = await HttpClientSlim.GetStringAsync(testUrl, validateCertificate: false).TimeoutAfter(TimeSpan.FromSeconds(2)); + var response = await HttpClientSlim.GetStringAsync(testUrl, validateCertificate: false); // Compare the response with Uri.ToString(), rather than testUrl directly. // Required to handle IPv6 addresses with zone index, like "fe80::3%1"