huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable tests for continuous integration. (#234)

This commit is contained in:
Justin Kotalik 2017-11-07 14:25:06 -08:00 committed by GitHub
parent b9ed1e073a
commit 89f6f16ba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -50,5 +50,4 @@ src/AspNetCore/version.h
*.VC.*db
global.json
korebuild-lock.txt

2
korebuild-lock.txt Normal file
View File

@ -0,0 +1,2 @@
version:2.1.0-preview1-15552
commithash:4af2f444ec8cba0faa866dd867370e6aa6df69ea

2
test/AspNetCoreModule.Test/Framework/InitializeTestMachine.cs
View File

@ -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;
}
}

58
test/AspNetCoreModule.Test/FunctionalTest.cs
View File

@ -11,8 +11,10 @@ namespace AspNetCoreModule.Test
{
public class FunctionalTest : FunctionalTestHelper, IClassFixture<InitializeTestMachine>
{
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")]

2
test/AspNetCoreModule.Test/FunctionalTestHelper.cs
View File

@ -35,7 +35,7 @@ namespace AspNetCoreModule.Test
{
get
{
if (TestFlags.Enabled(TestFlags.SkipTest))
if (_attributeValue == TestFlags.SkipTest)
{
AdditionalInfo = TestFlags.SkipTest + " is set";
return false;