Skip to content

Commit

Permalink
Clean up test skip conditions (#17529)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tratcher
Tratcher committed Dec 5, 2019
1 parent e757f2a commit 5033efb
Show file tree
Hide file tree
Showing 16 changed files with 26 additions and 137 deletions.
2 changes: 0 additions & 2 deletions src/Security/Security.sln
View file
Expand Up @@ -164,8 +164,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys", "..\Servers\HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj", "{D6C3C4A9-197B-47B5-8B72-35047CBC4F22}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers", "..\Http\Headers\src\Microsoft.Net.Http.Headers.csproj", "{4BB8D7D7-E111-4A86-B6E5-C1201E0DA8CE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
15 changes: 3 additions & 12 deletions src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs
View file
Expand Up @@ -3,7 +3,6 @@

using System;
using System.IO;
using System.Linq;
using System.Net.Http;
using System.Runtime.InteropServices;
using System.Security.Authentication;
Expand All @@ -20,12 +19,9 @@

namespace Microsoft.AspNetCore.Server.HttpSys
{
// Flaky doesn't support classes :(
// https://github.com/aspnet/Extensions/issues/1568
public class HttpsTests
{
[ConditionalFact]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
public async Task Https_200OK_Success()
{
using (Utilities.CreateDynamicHttpsServer(out var address, httpContext =>
Expand All @@ -39,7 +35,6 @@ public async Task Https_200OK_Success()
}

[ConditionalFact]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
public async Task Https_SendHelloWorld_Success()
{
using (Utilities.CreateDynamicHttpsServer(out var address, httpContext =>
Expand All @@ -55,7 +50,6 @@ public async Task Https_SendHelloWorld_Success()
}

[ConditionalFact]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
public async Task Https_EchoHelloWorld_Success()
{
using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>
Expand All @@ -73,7 +67,6 @@ public async Task Https_EchoHelloWorld_Success()
}

[ConditionalFact]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
public async Task Https_ClientCertNotSent_ClientCertNotPresent()
{
using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>
Expand Down Expand Up @@ -110,8 +103,7 @@ public async Task Https_ClientCertRequested_ClientCertPresent()
}

[ConditionalFact]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
[OSDontSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win7)]
public async Task Https_SkipsITlsHandshakeFeatureOnWin7()
{
using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>
Expand All @@ -133,8 +125,7 @@ public async Task Https_SkipsITlsHandshakeFeatureOnWin7()
}

[ConditionalFact]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
public async Task Https_SetsITlsHandshakeFeature()
{
using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>
Expand Down Expand Up @@ -164,7 +155,7 @@ public async Task Https_SetsITlsHandshakeFeature()
}

[ConditionalFact]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
public async Task Https_ITlsHandshakeFeature_MatchesIHttpSysExtensionInfoFeature()
{
using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>
Expand Down
99 changes: 0 additions & 99 deletions src/Servers/HttpSys/test/FunctionalTests/OSDontSkipConditionAttribute.cs
View file

This file was deleted.

17 changes: 8 additions & 9 deletions src/Servers/HttpSys/test/FunctionalTests/OpaqueUpgradeTests.cs
View file
Expand Up @@ -6,7 +6,6 @@
using System.Net.Http;
using System.Net.Sockets;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
Expand All @@ -18,7 +17,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
public class OpaqueUpgradeTests
{
[ConditionalFact]
[OSDontSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win7)]
public async Task OpaqueUpgrade_DownLevel_FeatureIsAbsent()
{
using (Utilities.CreateHttpServer(out var address, httpContext =>
Expand All @@ -44,7 +43,7 @@ public async Task OpaqueUpgrade_DownLevel_FeatureIsAbsent()
}

[ConditionalFact]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
public async Task OpaqueUpgrade_SupportKeys_Present()
{
string address;
Expand All @@ -71,7 +70,7 @@ public async Task OpaqueUpgrade_SupportKeys_Present()
}

[ConditionalFact]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
public async Task OpaqueUpgrade_AfterHeadersSent_Throws()
{
bool? upgradeThrew = null;
Expand Down Expand Up @@ -101,7 +100,7 @@ public async Task OpaqueUpgrade_AfterHeadersSent_Throws()
}

[ConditionalFact]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
public async Task OpaqueUpgrade_GetUpgrade_Success()
{
var upgraded = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
Expand All @@ -123,7 +122,7 @@ public async Task OpaqueUpgrade_GetUpgrade_Success()
}

[ConditionalFact]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
public async Task OpaqueUpgrade_GetUpgrade_NotAffectedByMaxRequestBodyLimit()
{
var upgraded = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
Expand Down Expand Up @@ -155,7 +154,7 @@ public async Task OpaqueUpgrade_GetUpgrade_NotAffectedByMaxRequestBodyLimit()
}

[ConditionalFact]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
public async Task OpaqueUpgrade_WithOnStarting_CallbackCalled()
{
var callbackCalled = false;
Expand Down Expand Up @@ -184,7 +183,7 @@ public async Task OpaqueUpgrade_WithOnStarting_CallbackCalled()
}

[ConditionalTheory]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
// See HTTP_VERB for known verbs
[InlineData("UNKNOWN", null)]
[InlineData("INVALID", null)]
Expand Down Expand Up @@ -242,7 +241,7 @@ public async Task OpaqueUpgrade_VariousMethodsUpgradeSendAndReceive_Success(stri
}

[ConditionalTheory]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
// Http.Sys returns a 411 Length Required if PUT or POST does not specify content-length or chunked.
[InlineData("POST", "Content-Length: 10")]
[InlineData("POST", "Transfer-Encoding: chunked")]
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/HttpSys/test/FunctionalTests/ResponseCachingTests.cs
View file
Expand Up @@ -66,7 +66,7 @@ public async Task Caching_JustPublic_NotCached()
}

[ConditionalFact]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win2008R2, WindowsVersions.Win7, SkipReason = "Content type not required for caching on Win7 and Win2008R2.")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "Content type not required for caching on Win7.")]
public async Task Caching_WithoutContentType_NotCached()
{
var requestCount = 1;
Expand Down
4 changes: 2 additions & 2 deletions src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs
View file
Expand Up @@ -35,15 +35,15 @@ public static TestMatrix TestVariants

[ConditionalTheory]
[MemberData(nameof(TestVariants))]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
public Task HttpsNoClientCert_NoClientCert(TestVariant variant)
{
return ClientCertTest(variant, sendClientCert: false);
}

[ConditionalTheory]
[MemberData(nameof(TestVariants))]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
public Task HttpsClientCert_GetCertInformation(TestVariant variant)
{
return ClientCertTest(variant, sendClientCert: true);
Expand Down
4 changes: 2 additions & 2 deletions src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs
View file
Expand Up @@ -32,7 +32,7 @@ public static TestMatrix TestVariants

[ConditionalTheory]
[MemberData(nameof(TestVariants))]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
public async Task HttpsHelloWorld(TestVariant variant)
{
var port = TestPortHelper.GetNextSSLPort();
Expand Down Expand Up @@ -94,7 +94,7 @@ public async Task ServerAddressesIncludesBaseAddress()

[ConditionalFact]
[RequiresNewHandler]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win81)]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
public async Task CheckProtocolIsHttp2()
{
var port = TestPortHelper.GetNextSSLPort();
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs
View file
Expand Up @@ -14,7 +14,7 @@
namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
{
[SkipIfHostableWebCoreNotAvailable]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
public class ClientDisconnectTests : StrictTestServerTests
{
[ConditionalFact]
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs
View file
Expand Up @@ -9,7 +9,7 @@
namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
{
[SkipIfHostableWebCoreNotAvailable]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
public class ConnectionIdFeatureTests : StrictTestServerTests
{
[ConditionalFact]
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs
View file
Expand Up @@ -10,7 +10,7 @@
namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
{
[SkipIfHostableWebCoreNotAvailable]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
public class HttpBodyControlFeatureTests : StrictTestServerTests
{
[ConditionalFact]
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs
View file
Expand Up @@ -15,7 +15,7 @@
namespace IIS.Tests
{
[SkipIfHostableWebCoreNotAvailable]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
public class MaxRequestBodySizeTests : LoggedTest
{
[ConditionalFact]
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs
View file
Expand Up @@ -12,7 +12,7 @@
namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
{
[SkipIfHostableWebCoreNotAvailable]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
public class ResponseAbortTests : StrictTestServerTests
{
[ConditionalFact]
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs
View file
Expand Up @@ -10,7 +10,7 @@
namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
{
[SkipIfHostableWebCoreNotAvailable]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
public class TestServerTest : StrictTestServerTests
{
[ConditionalFact]
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs
View file
Expand Up @@ -13,7 +13,7 @@
namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
{
[Collection(IISTestSiteCollection.Name)]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, SkipReason = "No supported on this platform")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "No WebSocket supported on Win7")]
public class WebSocketsTests
{
private readonly string _webSocketUri;
Expand Down
4 changes: 2 additions & 2 deletions src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs
View file
Expand Up @@ -320,7 +320,7 @@ public void ConfigureEndpointDevelopmentCertificateGetsIgnoredIfPfxFileDoesNotEx
// [InlineData("http2", HttpProtocols.Http2)] // Not supported due to missing ALPN support. https://github.com/dotnet/corefx/issues/33016
[InlineData("http1AndHttp2", HttpProtocols.Http1AndHttp2)] // Gracefully falls back to HTTP/1
[OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win10, WindowsVersions.Win81)]
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win7)]
public void DefaultConfigSectionCanSetProtocols_MacAndWin7(string input, HttpProtocols expected)
=> DefaultConfigSectionCanSetProtocols(input, expected);

Expand Down Expand Up @@ -389,7 +389,7 @@ private void DefaultConfigSectionCanSetProtocols(string input, HttpProtocols exp
// [InlineData("http2", HttpProtocols.Http2)] // Not supported due to missing ALPN support. https://github.com/dotnet/corefx/issues/33016
[InlineData("http1AndHttp2", HttpProtocols.Http1AndHttp2)] // Gracefully falls back to HTTP/1
[OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win10, WindowsVersions.Win81)]
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win7)]
public void EndpointConfigSectionCanSetProtocols_MacAndWin7(string input, HttpProtocols expected) =>
EndpointConfigSectionCanSetProtocols(input, expected);

Expand Down
2 changes: 1 addition & 1 deletion src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs
View file
Expand Up @@ -58,7 +58,7 @@ public void TlsAndHttp2NotSupportedOnMac()

[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win10, WindowsVersions.Win81)]
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win7)]
// Win7 SslStream is missing ALPN support.
public void TlsAndHttp2NotSupportedOnWin7()
{
Expand Down

0 comments on commit 5033efb

Please sign in to comment.