Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/9.0] Fix skip condition for IIS tests #57999

Merged
merged 3 commits into from
Sep 23, 2024
Merged

[release/9.0] Fix skip condition for IIS tests #57999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2941c56
Fix skip condition for IIS tests
wtgodbe Sep 20, 2024
98f0911
Update StartupTests.cs
wtgodbe Sep 20, 2024
0bb114e
Update StartupTests.cs
wtgodbe Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestPathBaseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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", "")]
Expand All @@ -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", "/")]
Expand Down
4 changes: 2 additions & 2 deletions src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -1297,7 +1297,7 @@ public async Task PreferEnvironmentVariablesOverWebConfigWhenConfigured(HostingM
[ConditionalFact]
[RequiresNewHandler]
[RequiresNewShim]
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
[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";
Expand Down
Loading