From 89f6f16ba5e15f55e2bbb1b2be6edba1c7e7972b Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 7 Nov 2017 14:25:06 -0800 Subject: [PATCH] Disable tests for continuous integration. (#234) --- .gitignore | 1 - korebuild-lock.txt | 2 + .../Framework/InitializeTestMachine.cs | 2 +- test/AspNetCoreModule.Test/FunctionalTest.cs | 58 ++++++++++--------- .../FunctionalTestHelper.cs | 2 +- 5 files changed, 34 insertions(+), 31 deletions(-) create mode 100644 korebuild-lock.txt diff --git a/.gitignore b/.gitignore index fa7a3504ea..c356cf3416 100644 --- a/.gitignore +++ b/.gitignore @@ -50,5 +50,4 @@ src/AspNetCore/version.h *.VC.*db global.json -korebuild-lock.txt diff --git a/korebuild-lock.txt b/korebuild-lock.txt new file mode 100644 index 0000000000..7c709d9092 --- /dev/null +++ b/korebuild-lock.txt @@ -0,0 +1,2 @@ +version:2.1.0-preview1-15552 +commithash:4af2f444ec8cba0faa866dd867370e6aa6df69ea diff --git a/test/AspNetCoreModule.Test/Framework/InitializeTestMachine.cs b/test/AspNetCoreModule.Test/Framework/InitializeTestMachine.cs index 9fc4d086c2..fa8f3a11c6 100644 --- a/test/AspNetCoreModule.Test/Framework/InitializeTestMachine.cs +++ b/test/AspNetCoreModule.Test/Framework/InitializeTestMachine.cs @@ -27,7 +27,7 @@ namespace AspNetCoreModule.Test.Framework public static bool Enabled(string flagValue) { - return InitializeTestMachine.GlobalTestFlags.Contains(flagValue.ToLower()); + return InitializeTestMachine.GlobalTestFlags.IndexOf(flagValue, StringComparison.OrdinalIgnoreCase) > -1; } } diff --git a/test/AspNetCoreModule.Test/FunctionalTest.cs b/test/AspNetCoreModule.Test/FunctionalTest.cs index 7f5c754a5b..2505b9f039 100644 --- a/test/AspNetCoreModule.Test/FunctionalTest.cs +++ b/test/AspNetCoreModule.Test/FunctionalTest.cs @@ -11,8 +11,10 @@ namespace AspNetCoreModule.Test { public class FunctionalTest : FunctionalTestHelper, IClassFixture { + private const string ANCMTestCondition = TestFlags.SkipTest; + [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.noChange)] @@ -23,7 +25,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.noChange, 5)] @@ -36,7 +38,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit, 25, 19, false)] @@ -57,7 +59,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit, 10)] @@ -70,7 +72,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit)] @@ -81,7 +83,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit)] @@ -92,7 +94,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit)] @@ -103,7 +105,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit)] @@ -114,7 +116,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit)] @@ -125,7 +127,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData("ANCMTestBar", "bar", "bar", IISConfigUtility.AppPoolBitness.enable32Bit)] @@ -142,7 +144,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit)] @@ -153,7 +155,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit)] @@ -164,7 +166,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit, "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789")] @@ -175,7 +177,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit)] @@ -186,7 +188,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit, 10)] @@ -197,7 +199,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit, "00:02:00")] @@ -210,7 +212,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit)] @@ -221,7 +223,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit, "dotnet.exe", "./")] @@ -234,7 +236,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit, true)] @@ -247,7 +249,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit, true, true)] @@ -260,7 +262,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit)] @@ -271,7 +273,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit)] @@ -282,7 +284,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit, "MS-ASPNETCORE", "f")] @@ -297,7 +299,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit, true)] @@ -309,7 +311,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.noChange, false, DoAppVerifierTest_StartUpMode.UseGracefulShutdown, DoAppVerifierTest_ShutDownMode.RecycleAppPool, 1)] @@ -325,7 +327,7 @@ namespace AspNetCoreModule.Test ////////////////////////////////////////////////////////// [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData(IISConfigUtility.AppPoolBitness.enable32Bit)] @@ -339,7 +341,7 @@ namespace AspNetCoreModule.Test // NOTE: below test scenarios are not valid for Win7 OS ////////////////////////////////////////////////////////// [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, SkipReason = "IIS does not support Websocket on Win7")] @@ -353,7 +355,7 @@ namespace AspNetCoreModule.Test } [ConditionalTheory] - [ANCMTestFlags(TestFlags.RequireRunAsAdministrator)] + [ANCMTestFlags(ANCMTestCondition)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, SkipReason = "WAS does not handle private memory limitation with Job object on Win7")] diff --git a/test/AspNetCoreModule.Test/FunctionalTestHelper.cs b/test/AspNetCoreModule.Test/FunctionalTestHelper.cs index 45200ac380..b35d93e745 100644 --- a/test/AspNetCoreModule.Test/FunctionalTestHelper.cs +++ b/test/AspNetCoreModule.Test/FunctionalTestHelper.cs @@ -35,7 +35,7 @@ namespace AspNetCoreModule.Test { get { - if (TestFlags.Enabled(TestFlags.SkipTest)) + if (_attributeValue == TestFlags.SkipTest) { AdditionalInfo = TestFlags.SkipTest + " is set"; return false;