From 2941c56f55a6669aa7f703370cddd06cd4536a1d Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 20 Sep 2024 16:02:12 -0700 Subject: [PATCH 1/3] Fix skip condition for IIS tests --- .../IIS/test/Common.FunctionalTests/RequestPathBaseTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestPathBaseTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestPathBaseTests.cs index 72d8e28d2544..6ae4aa2aff36 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestPathBaseTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestPathBaseTests.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests; #endif [Collection(IISSubAppSiteCollection.Name)] -[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")] +[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")] public class RequestPathBaseTests : FixtureLoggedTest { private readonly IISSubAppSiteFixture _fixture; @@ -32,7 +32,7 @@ public RequestPathBaseTests(IISSubAppSiteFixture fixture) : base(fixture) } [ConditionalTheory] - [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")] + [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")] [RequiresNewHandler] [InlineData("/Sub/App/PathAndPathBase", "/Sub/App/PathAndPathBase", "")] [InlineData("/SUb/APp/PathAndPAthBase", "/SUb/APp/PathAndPAthBase", "")] @@ -53,7 +53,7 @@ public async Task RequestPathBase_Split(string url, string expectedPathBase, str } [ConditionalTheory] - [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")] + [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")] [RequiresNewHandler] [InlineData("//Sub/App/PathAndPathBase", "//Sub/App/PathAndPathBase", "")] [InlineData(@"/\Sub/App/PathAndPathBase/", @"/\Sub/App/PathAndPathBase", "/")] From 98f091159157f1b32e88c876c845d2610509a173 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 20 Sep 2024 16:14:41 -0700 Subject: [PATCH 2/3] Update StartupTests.cs --- src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs index 353d1e303ba6..2e0f3dad45ff 100644 --- a/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs +++ b/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests; // Contains all tests related to Startup, requiring starting ANCM/IIS every time. [Collection(PublishedSitesCollection.Name)] -[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")] +[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")] public class StartupTests : IISFunctionalTestBase { public StartupTests(PublishedSitesFixture fixture) : base(fixture) @@ -1297,7 +1297,7 @@ public async Task PreferEnvironmentVariablesOverWebConfigWhenConfigured(HostingM [ConditionalFact] [RequiresNewHandler] [RequiresNewShim] - [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")] + [("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")] public async Task ServerAddressesIncludesBaseAddress() { var appName = "\u041C\u043E\u0451\u041F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435"; From 0bb114e14afd5c2a39c487472c8ad7ab5b637485 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 20 Sep 2024 16:42:02 -0700 Subject: [PATCH 3/3] Update StartupTests.cs --- src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs index 2e0f3dad45ff..94330d603342 100644 --- a/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs +++ b/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs @@ -1297,7 +1297,7 @@ public async Task PreferEnvironmentVariablesOverWebConfigWhenConfigured(HostingM [ConditionalFact] [RequiresNewHandler] [RequiresNewShim] - [("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")] + [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")] public async Task ServerAddressesIncludesBaseAddress() { var appName = "\u041C\u043E\u0451\u041F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435";