diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/HttpsTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/HttpsTests.cs index 058ab551f9..2309b9cf7d 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/HttpsTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/HttpsTests.cs @@ -17,8 +17,7 @@ namespace Microsoft.AspNetCore.Server.WebListener { private const string Address = "https://localhost:9090/"; - // Disabled due to SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698) - //[ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] + [ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] public async Task Https_200OK_Success() { using (Utilities.CreateHttpsServer(httpContext => @@ -31,8 +30,7 @@ namespace Microsoft.AspNetCore.Server.WebListener } } - // Disabled due to SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698) - //[ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] + [ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] public async Task Https_SendHelloWorld_Success() { using (Utilities.CreateHttpsServer(httpContext => @@ -47,8 +45,7 @@ namespace Microsoft.AspNetCore.Server.WebListener } } - // Disabled due to SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698) - //[ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] + [ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] public async Task Https_EchoHelloWorld_Success() { using (Utilities.CreateHttpsServer(httpContext => @@ -66,8 +63,7 @@ namespace Microsoft.AspNetCore.Server.WebListener } } - // Disabled due to SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698) - //[ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] + [ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] public async Task Https_ClientCertNotSent_ClientCertNotPresent() { using (Utilities.CreateHttpsServer(async httpContext => @@ -84,8 +80,7 @@ namespace Microsoft.AspNetCore.Server.WebListener } } - // Disabled due to SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698) - //[ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] + [ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] public async Task Https_ClientCertRequested_ClientCertPresent() { using (Utilities.CreateHttpsServer(async httpContext => diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/HttpsTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/HttpsTests.cs index ff8709377a..da34f91cfe 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/HttpsTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/HttpsTests.cs @@ -16,8 +16,7 @@ namespace Microsoft.Net.Http.Server // Note these tests can't use dynamic ports or run concurrently because the ssl cert must be pre-registered with a specific port. private const string Address = "https://localhost:9090/"; - // Disabled due to SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698) - //[ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] + [ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] public async Task Https_200OK_Success() { using (var server = Utilities.CreateHttpsServer()) @@ -32,8 +31,7 @@ namespace Microsoft.Net.Http.Server } } - // Disabled due to SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698) - //[ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] + [ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] public async Task Https_SendHelloWorld_Success() { using (var server = Utilities.CreateHttpsServer()) @@ -51,8 +49,7 @@ namespace Microsoft.Net.Http.Server } } - // Disabled due to SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698) - //[ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] + [ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] public async Task Https_EchoHelloWorld_Success() { using (var server = Utilities.CreateHttpsServer()) @@ -73,8 +70,7 @@ namespace Microsoft.Net.Http.Server } } - // Disabled due to SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698) - //[ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] + [ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] public async Task Https_ClientCertNotSent_ClientCertNotPresent() { using (var server = Utilities.CreateHttpsServer()) @@ -91,8 +87,7 @@ namespace Microsoft.Net.Http.Server } } - // Disabled due to SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698) - //[ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] + [ConditionalFact(Skip = "TODO: Add trait filtering support so these SSL tests don't get run on teamcity or the command line."), Trait("scheme", "https")] public async Task Https_ClientCertRequested_ClientCertPresent() { using (var server = Utilities.CreateHttpsServer())