From 4334fe19f29827d2a12830e0332164e991328076 Mon Sep 17 00:00:00 2001 From: John Luo Date: Sat, 25 Mar 2017 21:42:42 -0700 Subject: [PATCH] Clean up test skip conditions --- test/FunctionalTests/HelloWorldTest.cs | 17 ++++----- test/FunctionalTests/HttpsTest.cs | 36 +++++++------------- test/FunctionalTests/NtlmAuthentationTest.cs | 12 +++---- 3 files changed, 22 insertions(+), 43 deletions(-) diff --git a/test/FunctionalTests/HelloWorldTest.cs b/test/FunctionalTests/HelloWorldTest.cs index 5e2d43b988..92dfebf342 100644 --- a/test/FunctionalTests/HelloWorldTest.cs +++ b/test/FunctionalTests/HelloWorldTest.cs @@ -16,22 +16,19 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // Uses ports ranging 5061 - 5069. public class HelloWorldTests { -#if NET46 [ConditionalTheory] - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] //[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5061/", ServerType.Kestrel, ApplicationType.Portable)] [InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5062/", ServerType.Kestrel, ApplicationType.Portable)] public Task HelloWorld_IISExpress(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ServerType delegateServer, ApplicationType applicationType) { return HelloWorld(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, delegateServer, applicationType); } -#endif -#if NETCOREAPP2_0 [ConditionalTheory] - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [FrameworkSkipCondition(RuntimeFrameworks.CLR)] //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5063/", ServerType.Kestrel, ApplicationType.Portable)] // TODO reenable when https://github.com/dotnet/sdk/issues/696 is resolved //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5064/", ServerType.Kestrel, ApplicationType.Standalone)] @@ -40,13 +37,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { return HelloWorld(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, delegateServer, applicationType); } -#endif [ConditionalTheory] [SkipIfEnvironmentVariableNotEnabled("IIS_VARIATIONS_ENABLED")] - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - [SkipIfCurrentRuntimeIsCoreClr] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] [InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5069/", ServerType.Kestrel, ApplicationType.Portable)] //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5070/", ServerType.Kestrel, ApplicationType.Standalone)] public Task HelloWorld_IIS(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ServerType delegateServer, ApplicationType applicationType) diff --git a/test/FunctionalTests/HttpsTest.cs b/test/FunctionalTests/HttpsTest.cs index 6da386fc81..bf50b05a18 100644 --- a/test/FunctionalTests/HttpsTest.cs +++ b/test/FunctionalTests/HttpsTest.cs @@ -17,21 +17,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // IisExpress preregisteres 44300-44399 ports. public class HttpsTest { -#if NET46 [ConditionalTheory] - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] [InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "https://localhost:44396/", ApplicationType.Portable)] public Task Https_HelloWorld(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType) { return HttpsHelloWorld(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType); } -#endif -#if NETCOREAPP2_0 [ConditionalTheory(Skip = "No test configuration enabled")] - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [FrameworkSkipCondition(RuntimeFrameworks.CLR)] //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "https://localhost:44394/", ApplicationType.Portable)] // TODO reenable when https://github.com/dotnet/sdk/issues/696 is resolved //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44395/", ApplicationType.Standalone)] @@ -39,7 +36,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { return HttpsHelloWorld(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType); } -#endif public async Task HttpsHelloWorld(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType) { @@ -92,21 +88,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } -#if NET46 [ConditionalTheory(Skip = "No test configuration enabled")] - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] //[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x86, "https://localhost:44399/", ApplicationType.Standalone)] public Task Https_HelloWorld_NoClientCert(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType) { return HttpsHelloWorldCerts(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType, sendClientCert: false); } -#endif -#if NETCOREAPP2_0 [ConditionalTheory] - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [FrameworkSkipCondition(RuntimeFrameworks.CLR)] // TODO reenable when https://github.com/dotnet/sdk/issues/696 is resolved //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44397/", ApplicationType.Standalone)] [InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44398/", ApplicationType.Portable)] @@ -114,29 +107,24 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { return HttpsHelloWorldCerts(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType, sendClientCert: false); } -#endif -#if NET46 [ConditionalTheory(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")] - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] [InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "https://localhost:44401/", ApplicationType.Portable)] public Task Https_HelloWorld_ClientCert(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType) { return HttpsHelloWorldCerts(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType, sendClientCert: true); } -#endif -#if NETCOREAPP2_0 [ConditionalTheory(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")] - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [FrameworkSkipCondition(RuntimeFrameworks.CLR)] //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "https://localhost:44400/", ApplicationType.Standalone)] public Task Https_HelloWorld_ClientCert_CoreCLR(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType) { return HttpsHelloWorldCerts(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType, sendClientCert: true); } -#endif public async Task HttpsHelloWorldCerts(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType, bool sendClientCert) { diff --git a/test/FunctionalTests/NtlmAuthentationTest.cs b/test/FunctionalTests/NtlmAuthentationTest.cs index 12dd0e11d4..4838ae7152 100644 --- a/test/FunctionalTests/NtlmAuthentationTest.cs +++ b/test/FunctionalTests/NtlmAuthentationTest.cs @@ -26,21 +26,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests _output = output; } -#if NET46 [ConditionalTheory] - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] [InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5051/", ApplicationType.Portable)] public Task NtlmAuthentication(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType) { return NtlmAuthentication(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType); } -#endif -#if NETCOREAPP2_0 [ConditionalTheory(Skip = "No test configuration enabled")] - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [FrameworkSkipCondition(RuntimeFrameworks.CLR)] //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5050/", ApplicationType.Standalone)] // TODO reenable when https://github.com/dotnet/sdk/issues/696 is resolved //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5052/", ApplicationType.Standalone)] @@ -48,7 +45,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { return NtlmAuthentication(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType); } -#endif public async Task NtlmAuthentication(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType) {