From b85adeee6d3820d1513b70c2b41adcd74ae8ae62 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 30 Jul 2018 11:57:35 -0700 Subject: [PATCH] Skip 21 inproc tests (#862) --- test/MusicStore.E2ETests/PublishAndRunTests.cs | 12 +++++++++++- test/MusicStore.E2ETests/SmokeTests.cs | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/test/MusicStore.E2ETests/PublishAndRunTests.cs b/test/MusicStore.E2ETests/PublishAndRunTests.cs index 32851dc0af..9113197099 100644 --- a/test/MusicStore.E2ETests/PublishAndRunTests.cs +++ b/test/MusicStore.E2ETests/PublishAndRunTests.cs @@ -16,14 +16,24 @@ namespace E2ETests { public static TestMatrix TestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys) - .WithTfms(Tfm.NetCoreApp22, Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461) + .WithTfms(Tfm.NetCoreApp22) .WithAllApplicationTypes() .WithAllAncmVersions() .WithAllHostingModels() .WithAllArchitectures(); + // ANCM In-process cannot run on netcoreapp2.1 and below + public static TestMatrix TestVariantsWithoutInproc + => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys) + .WithTfms(Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461) + .WithAllApplicationTypes() + .WithAllAncmVersions() + .WithHostingModels(HostingModel.OutOfProcess) + .WithAllArchitectures(); + [ConditionalTheory] [MemberData(nameof(TestVariants))] + [MemberData(nameof(TestVariantsWithoutInproc))] public async Task PublishAndRun_Test(TestVariant variant) { var testName = $"PublishAndRunTests_{variant}"; diff --git a/test/MusicStore.E2ETests/SmokeTests.cs b/test/MusicStore.E2ETests/SmokeTests.cs index 57250a475d..ffebaf5351 100644 --- a/test/MusicStore.E2ETests/SmokeTests.cs +++ b/test/MusicStore.E2ETests/SmokeTests.cs @@ -17,13 +17,23 @@ namespace E2ETests { public static TestMatrix TestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys) - .WithTfms(Tfm.NetCoreApp22, Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461) + .WithTfms(Tfm.NetCoreApp22) .WithAllApplicationTypes() .WithAllAncmVersions() .WithAllHostingModels(); + // ANCM In-process cannot run on netcoreapp2.1 and below + public static TestMatrix TestVariantsWithoutInproc + => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys) + .WithTfms(Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461) + .WithAllApplicationTypes() + .WithAllAncmVersions() + .WithHostingModels(HostingModel.OutOfProcess) + .WithAllArchitectures(); + [ConditionalTheory] [MemberData(nameof(TestVariants))] + [MemberData(nameof(TestVariantsWithoutInproc))] public async Task Smoke_Tests(TestVariant variant) { var testName = $"SmokeTestSuite_{variant}";