Skip to content

Commit e3bbb9d

Browse files
committed
Don't run IIS websocket tests on unsupported queue
1 parent 3ed133d commit e3bbb9d

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/IISTestSiteFixture.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ internal IISTestSiteFixture(Action<IISDeploymentParameters> configure)
5050
// Uncomment to add IIS debug logs to test output.
5151
//DeploymentParameters.EnvironmentVariables.Add("ASPNETCORE_MODULE_DEBUG", "console");
5252

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

5660
public HttpClient Client => DeploymentResult.HttpClient;

src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketTests.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,18 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
2929
#endif
3030

3131
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "No WebSocket supported on Win7")]
32-
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
32+
#if IISEXPRESS_FUNCTIONALS
33+
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open")]
34+
#else
35+
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;Windows.Amd64.Server2022.Open")]
36+
#endif
3337
public abstract class WebSocketsTests : FunctionalTestsBase
3438
{
3539
public IISTestSiteFixture Fixture { get; }
3640

3741
public WebSocketsTests(IISTestSiteFixture fixture, ITestOutputHelper testOutput) : base(testOutput)
3842
{
3943
Fixture = fixture;
40-
Fixture.DeploymentParameters.EnableLogging("C:/github/aspnetcore/artifacts/log");
4144
}
4245

4346
[ConditionalFact]

0 commit comments

Comments
 (0)