From e10f64c32f0293424182d62078a4892a37c8d096 Mon Sep 17 00:00:00 2001 From: Victor Hurdugaci Date: Mon, 15 Dec 2014 16:45:35 -0800 Subject: [PATCH] Ignore some tests on downlevel --- .../OpaqueUpgradeTests.cs | 16 +++++++++++----- .../WebSocketTests.cs | 13 +++++++++---- .../project.json | 1 + 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs index cfbcb1827c..e3251b226d 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs @@ -26,13 +26,15 @@ using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http; using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore; +using Microsoft.AspNet.Testing.xunit; using Xunit; namespace Microsoft.AspNet.Server.WebListener { public class OpaqueUpgradeTests { - [Fact] + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Win7And2008R2)] public async Task OpaqueUpgrade_SupportKeys_Present() { string address; @@ -59,7 +61,8 @@ namespace Microsoft.AspNet.Server.WebListener } } - [Fact] + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Win7And2008R2)] public async Task OpaqueUpgrade_AfterHeadersSent_Throws() { bool? upgradeThrew = null; @@ -88,7 +91,8 @@ namespace Microsoft.AspNet.Server.WebListener } } - [Fact] + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Win7And2008R2)] public async Task OpaqueUpgrade_GetUpgrade_Success() { ManualResetEvent waitHandle = new ManualResetEvent(false); @@ -115,7 +119,8 @@ namespace Microsoft.AspNet.Server.WebListener } } - [Theory] + [ConditionalTheory] + [OSSkipCondition(OperatingSystems.Win7And2008R2)] // See HTTP_VERB for known verbs [InlineData("UNKNOWN", null)] [InlineData("INVALID", null)] @@ -173,7 +178,8 @@ namespace Microsoft.AspNet.Server.WebListener } } - [Theory] + [ConditionalTheory] + [OSSkipCondition(OperatingSystems.Win7And2008R2)] // 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")] diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/WebSocketTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/WebSocketTests.cs index c35719bd76..ba477973da 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/WebSocketTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/WebSocketTests.cs @@ -24,13 +24,15 @@ using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Http; using Microsoft.AspNet.HttpFeature; using Microsoft.AspNet.PipelineCore; +using Microsoft.AspNet.Testing.xunit; using Xunit; namespace Microsoft.AspNet.Server.WebListener { public class WebSocketTests { - [Fact] + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Win7And2008R2)] public async Task WebSocketTests_SupportKeys_Present() { string address; @@ -57,7 +59,8 @@ namespace Microsoft.AspNet.Server.WebListener } } - [Fact] + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Win7And2008R2)] public async Task WebSocketTests_AfterHeadersSent_Throws() { bool? upgradeThrew = null; @@ -86,7 +89,8 @@ namespace Microsoft.AspNet.Server.WebListener } } - [Fact] + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Win7And2008R2)] public async Task WebSocketAccept_Success() { ManualResetEvent waitHandle = new ManualResetEvent(false); @@ -112,7 +116,8 @@ namespace Microsoft.AspNet.Server.WebListener } } - [Fact] + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Win7And2008R2)] public async Task WebSocketAccept_SendAndReceive_Success() { byte[] clientBuffer = new byte[] { 0x00, 0x01, 0xFF, 0x00, 0x00 }; diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json index f3ed4c727f..e2fc11811b 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json @@ -5,6 +5,7 @@ "dependencies": { "Microsoft.AspNet.PipelineCore": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", + "Microsoft.AspNet.Testing": "1.0.0-*", "Xunit.KRunner": "1.0.0-*" }, "frameworks": {