Skip to content
This repository was archived by the owner on Dec 18, 2018. It is now read-only.

Commit 4b21411

Browse files
author
Cesar Blum Silveira
committed
Proper skip reasons for HttpsConnectionFilter tests (#677).
1 parent 3f0e654 commit 4b21411

File tree

1 file changed

+9
-18
lines changed

1 file changed

+9
-18
lines changed

test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ private async Task App(HttpContext httpContext)
5353
// https://github.com/aspnet/KestrelHttpServer/issues/240
5454
// This test currently fails on mono because of an issue with SslStream.
5555
[ConditionalFact]
56-
[OSSkipCondition(OperatingSystems.Linux)]
57-
[OSSkipCondition(OperatingSystems.MacOSX)]
56+
[OSSkipCondition(OperatingSystems.Linux, SkipReason = "WinHttpHandler not available on non-Windows.")]
57+
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "WinHttpHandler not available on non-Windows.")]
5858
public async Task CanReadAndWriteWithHttpsConnectionFilter()
5959
{
6060
RemoteCertificateValidationCallback validationCallback =
@@ -96,11 +96,9 @@ public async Task CanReadAndWriteWithHttpsConnectionFilter()
9696
}
9797
}
9898

99-
// https://github.com/aspnet/KestrelHttpServer/issues/240
100-
// This test currently fails on mono because of an issue with SslStream.
10199
[ConditionalFact]
102-
[OSSkipCondition(OperatingSystems.Linux)]
103-
[OSSkipCondition(OperatingSystems.MacOSX)]
100+
[OSSkipCondition(OperatingSystems.Linux, SkipReason = "WinHttpHandler not available on non-Windows.")]
101+
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "WinHttpHandler not available on non-Windows.")]
104102
public async Task RequireCertificateFailsWhenNoCertificate()
105103
{
106104
RemoteCertificateValidationCallback validationCallback =
@@ -143,11 +141,9 @@ await Assert.ThrowsAnyAsync<Exception>(
143141
}
144142
}
145143

146-
// https://github.com/aspnet/KestrelHttpServer/issues/240
147-
// This test currently fails on mono because of an issue with SslStream.
148144
[ConditionalFact]
149-
[OSSkipCondition(OperatingSystems.Linux)]
150-
[OSSkipCondition(OperatingSystems.MacOSX)]
145+
[OSSkipCondition(OperatingSystems.Linux, SkipReason = "WinHttpHandler not available on non-Windows.")]
146+
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "WinHttpHandler not available on non-Windows.")]
151147
public async Task AllowCertificateContinuesWhenNoCertificate()
152148
{
153149
RemoteCertificateValidationCallback validationCallback =
@@ -197,11 +193,8 @@ public async Task AllowCertificateContinuesWhenNoCertificate()
197193
}
198194
}
199195

200-
// https://github.com/aspnet/KestrelHttpServer/issues/240
201-
// This test currently fails on mono because of an issue with SslStream.
202196
[ConditionalFact]
203-
[OSSkipCondition(OperatingSystems.Linux)]
204-
[OSSkipCondition(OperatingSystems.MacOSX)]
197+
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "This test currently fails on Mono because of an issue with SslStream (https://github.com/aspnet/KestrelHttpServer/issues/240).")]
205198
public async Task CertificatePassedToHttpContext()
206199
{
207200
RemoteCertificateValidationCallback validationCallback =
@@ -263,11 +256,9 @@ public async Task CertificatePassedToHttpContext()
263256
}
264257
}
265258

266-
// https://github.com/aspnet/KestrelHttpServer/issues/240
267-
// This test currently fails on mono because of an issue with SslStream.
268259
[ConditionalFact]
269-
[OSSkipCondition(OperatingSystems.Linux)]
270-
[OSSkipCondition(OperatingSystems.MacOSX)]
260+
[OSSkipCondition(OperatingSystems.Linux, SkipReason = "WinHttpHandler not available on non-Windows.")]
261+
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "WinHttpHandler not available on non-Windows.")]
271262
public async Task HttpsSchemePassedToRequestFeature()
272263
{
273264
RemoteCertificateValidationCallback validationCallback =

0 commit comments

Comments
 (0)