huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Re-enable HTTPS tests (#1273).

This commit is contained in:
Cesar Blum Silveira 2017-01-03 14:23:49 -08:00
parent 57b368566d
commit cf77813c82
7 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/SampleApp/project.json
View File

@ -28,5 +28,5 @@
"configProperties": { "configProperties": {
"System.GC.Server": true "System.GC.Server": true
} }
} }
} }

4
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs
View File

@ -36,14 +36,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
await RegisterAddresses_Success(addressInput, testUrls); await RegisterAddresses_Success(addressInput, testUrls);
} }
[Theory(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)"), MemberData(nameof(IPEndPointRegistrationDataRandomPort))] [ConditionalTheory, MemberData(nameof(IPEndPointRegistrationDataRandomPort))]
[IPv6SupportedCondition] [IPv6SupportedCondition]
public async Task RegisterIPEndPoint_RandomPort_Success(IPEndPoint endPoint, Func<IPEndPoint, string> testUrl) public async Task RegisterIPEndPoint_RandomPort_Success(IPEndPoint endPoint, Func<IPEndPoint, string> testUrl)
{ {
await RegisterIPEndPoint_Success(endPoint, testUrl); await RegisterIPEndPoint_Success(endPoint, testUrl);
} }
[ConditionalTheory(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)"), MemberData(nameof(IPEndPointRegistrationDataPort443))] [ConditionalTheory, MemberData(nameof(IPEndPointRegistrationDataPort443))]
[IPv6SupportedCondition] [IPv6SupportedCondition]
[PortSupportedCondition(443)] [PortSupportedCondition(443)]
public async Task RegisterIPEndPoint_Port443_Success(IPEndPoint endpoint, Func<IPEndPoint, string> testUrl) public async Task RegisterIPEndPoint_Port443_Success(IPEndPoint endpoint, Func<IPEndPoint, string> testUrl)

4
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpClientSlimTests.cs
View File

@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
} }
} }
[Fact(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)")] [Fact]
public async Task GetStringAsyncHttps() public async Task GetStringAsyncHttps()
{ {
using (var host = StartHost(protocol: "https")) using (var host = StartHost(protocol: "https"))
@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
} }
} }
[Fact(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)")] [Fact]
public async Task PostAsyncHttps() public async Task PostAsyncHttps()
{ {
using (var host = StartHost(protocol: "https", using (var host = StartHost(protocol: "https",

5
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpsTests.cs
View File

@ -91,7 +91,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
} }
// Regression test for https://github.com/aspnet/KestrelHttpServer/issues/1103#issuecomment-246971172 // Regression test for https://github.com/aspnet/KestrelHttpServer/issues/1103#issuecomment-246971172
[Fact(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)")] [Fact]
public async Task DoesNotThrowObjectDisposedExceptionOnConnectionAbort() public async Task DoesNotThrowObjectDisposedExceptionOnConnectionAbort()
{ {
var x509Certificate2 = new X509Certificate2("TestResources/testCert.pfx", "testPassword"); var x509Certificate2 = new X509Certificate2("TestResources/testCert.pfx", "testPassword");
@ -104,7 +104,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
listenOptions.UseHttps("TestResources/testCert.pfx", "testPassword"); listenOptions.UseHttps("TestResources/testCert.pfx", "testPassword");
}); });
}) })
.UseUrls("https://127.0.0.1:0/")
.UseLoggerFactory(loggerFactory) .UseLoggerFactory(loggerFactory)
.Configure(app => app.Run(async httpContext => .Configure(app => app.Run(async httpContext =>
{ {
@ -144,7 +143,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
Assert.False(loggerFactory.ErrorLogger.ObjectDisposedExceptionLogged); Assert.False(loggerFactory.ErrorLogger.ObjectDisposedExceptionLogged);
} }
[Fact(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)")] [Fact]
public async Task DoesNotThrowObjectDisposedExceptionFromWriteAsyncAfterConnectionIsAborted() public async Task DoesNotThrowObjectDisposedExceptionFromWriteAsyncAfterConnectionIsAborted()
{ {
var tcs = new TaskCompletionSource<object>(); var tcs = new TaskCompletionSource<object>();

2
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/LoggingConnectionAdapterTests.cs
View File

@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{ {
public class LoggingConnectionAdapterTests public class LoggingConnectionAdapterTests
{ {
[Fact(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)")] [Fact]
public async Task LoggingConnectionFilterCanBeAddedBeforeAndAfterHttpsFilter() public async Task LoggingConnectionFilterCanBeAddedBeforeAndAfterHttpsFilter()
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()

2
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/MaxRequestBufferSizeTests.cs
View File

@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
} }
} }
[Theory(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)")] [Theory]
[MemberData("LargeUploadData")] [MemberData("LargeUploadData")]
public async Task LargeUpload(long? maxRequestBufferSize, bool ssl, bool expectPause) public async Task LargeUpload(long? maxRequestBufferSize, bool ssl, bool expectPause)
{ {

14
test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionAdapterTests.cs
View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
// https://github.com/aspnet/KestrelHttpServer/issues/240 // https://github.com/aspnet/KestrelHttpServer/issues/240
// This test currently fails on mono because of an issue with SslStream. // This test currently fails on mono because of an issue with SslStream.
[Fact(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)")] [Fact]
public async Task CanReadAndWriteWithHttpsConnectionAdapter() public async Task CanReadAndWriteWithHttpsConnectionAdapter()
{ {
var serviceContext = new TestServiceContext(); var serviceContext = new TestServiceContext();
@ -52,7 +52,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
} }
} }
[Fact(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)")] [Fact]
public async Task RequireCertificateFailsWhenNoCertificate() public async Task RequireCertificateFailsWhenNoCertificate()
{ {
var serviceContext = new TestServiceContext(); var serviceContext = new TestServiceContext();
@ -76,7 +76,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
} }
} }
[Fact(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)")] [Fact]
public async Task AllowCertificateContinuesWhenNoCertificate() public async Task AllowCertificateContinuesWhenNoCertificate()
{ {
var serviceContext = new TestServiceContext(); var serviceContext = new TestServiceContext();
@ -139,7 +139,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
} }
[Fact(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)")] [Fact]
public async Task CertificatePassedToHttpContext() public async Task CertificatePassedToHttpContext()
{ {
var serviceContext = new TestServiceContext(); var serviceContext = new TestServiceContext();
@ -178,7 +178,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
} }
} }
[Fact(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)")] [Fact]
public async Task HttpsSchemePassedToRequestFeature() public async Task HttpsSchemePassedToRequestFeature()
{ {
var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0))
@ -197,7 +197,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
} }
} }
[Fact(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)")] [Fact]
public async Task DoesNotSupportTls10() public async Task DoesNotSupportTls10()
{ {
var serviceContext = new TestServiceContext(); var serviceContext = new TestServiceContext();
@ -325,7 +325,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
} }
} }
[Fact(Skip = "SslStream hanging on write after update to CoreFx 4.4 (https://github.com/dotnet/corefx/issues/14698)")] [Fact]
public async Task CertificatePassedToHttpContextIsNotDisposed() public async Task CertificatePassedToHttpContextIsNotDisposed()
{ {
var serviceContext = new TestServiceContext(); var serviceContext = new TestServiceContext();