Skip to content

Don't run IIS websocket tests on unsupported queue #59036

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

Merged
merged 3 commits into from
Nov 19, 2024
Merged

Don't run IIS websocket tests on unsupported queue #59036

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
e3bbb9d
Don't run IIS websocket tests on unsupported queue
BrennanConroy Nov 18, 2024
61d860a
comment
BrennanConroy Nov 18, 2024
ad5fed6
Update src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure…
BrennanConroy Nov 19, 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: 5 additions & 1 deletion src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/IISTestSiteFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,11 @@ internal IISTestSiteFixture(Action<IISDeploymentParameters> configure)
// Uncomment to add IIS debug logs to test output.
//DeploymentParameters.EnvironmentVariables.Add("ASPNETCORE_MODULE_DEBUG", "console");

DeploymentParameters.EnableModule("WebSocketModule", "%IIS_BIN%/iiswsock.dll");
// This queue does not have websockets enabled currently, adding the module will break all tests using this fixture.
if (!HelixHelper.GetTargetHelixQueue().ToLowerInvariant().Contains("windows.amd64.server2022"))
{
DeploymentParameters.EnableModule("WebSocketModule", "%IIS_BIN%/iiswsock.dll");
}
}

public HttpClient Client => DeploymentResult.HttpClient;
Expand Down
8 changes: 6 additions & 2 deletions src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,19 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
#endif

[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "No WebSocket supported on Win7")]
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
#if IISEXPRESS_FUNCTIONALS
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open")]
#else
// These queues do not have websockets enabled currently for full IIS
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;Windows.Amd64.Server2022.Open")]
#endif
public abstract class WebSocketsTests : FunctionalTestsBase
{
public IISTestSiteFixture Fixture { get; }

public WebSocketsTests(IISTestSiteFixture fixture, ITestOutputHelper testOutput) : base(testOutput)
{
Fixture = fixture;
Fixture.DeploymentParameters.EnableLogging("C:/github/aspnetcore/artifacts/log");
}

[ConditionalFact]
Expand Down
Loading